diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/AcceptanceComparison.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/AcceptanceComparison.py
deleted file mode 100644
index 76a8ce88e693ce467015397318f776150b0cec6f..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/AcceptanceComparison.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from builtins import str
-from builtins import range
-def getconfig():
-
-    configdict = {}
-
-    configdict["Inputs"] = {}
-    configdict["Inputs"] = {
-        "FloatFT":
-        {"FileName" : "/afs/cern.ch/work/v/vibattis/public/B2DX/Bd2DPi/sFit/SSbarAccAsymmFTFloatingDMGammaConstrAllSamplesBlinded_SSrlogit/workResults.root",
-         "FitResult" : "fitresult_time_signal_TimePdf_dataSet_time_weighted",
-         "Workspace" : "workspace",
-         "Parameters" : ["Acceptance_SplineAccCoeff"+str(i) for i in range(0,9)],
-         "Positions" : list(range(0,9))
-         },
-        "ConstrFT":
-        {"FileName" : "/afs/cern.ch/work/v/vibattis/public/B2DX/Bd2DPi/sFit/SSbarAccAsymmFloatingDMGammaFTConstrAllSamplesBlinded_SSrlogit/workResults.root",
-         "FitResult" : "fitresult_time_signal_TimePdf_dataSet_time_weighted",
-         "Workspace" : "workspace",
-         "Parameters" : ["Acceptance_SplineAccCoeff"+str(i) for i in range(0,9)],
-         "Positions" : list(range(0,9))
-         }
-        }
-    
-    configdict["Parameters"] = {}
-    configdict["Parameters"] = [r"v_{"+str(i)+"}" for i in range(1,10)]
-    
-    #Temporary workaround
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5090,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersConst_M_flat"}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForACPAsymmetryTest.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForACPAsymmetryTest.py
deleted file mode 100644
index 9d3e4342dd3bc0f6e6b6bc0bbe65b5ea4a7e4879..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForACPAsymmetryTest.py
+++ /dev/null
@@ -1,89 +0,0 @@
-def getconfig():
-
-    configdict = {}
-
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.4,     15.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_ctau_flat"}
-    configdict["BasicVariables"]["TagDecTrue"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                        "Name"                   : "TagDecTrue",
-                                                        "InputName"              : "TrueTag"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_TRUEID"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecOS",
-                                                      "InputName"              : "TagDecOS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecSS",
-                                                      "InputName"              : "TagDecSS"}
-
-    configdict["Samples"] = {}
-    configdict["Functions"] = {}
-
-    #Original MC
-    configdict["Samples"]["MC"] = { "File" : "/afs/cern.ch/work/v/vibattis/public/B2DX/Bd2DPi/Workspace/Nominal/work_dpi_mc_large_shorttime.root",
-                                    "Workspace" : "workspace",
-                                    "Dataprefix" : "dataSetMC_",
-                                    "Decay" : "Bd2DPi",
-                                    "Sample" : "both",
-                                    "Mode" : "kpipi",
-                                    "Year" : "run1",
-                                    "Hypo" : "Bd2DPi",
-                                    "Merge" : "both",
-                                    "Observable" : "BeautyTime",
-                                    "Category1" : "(TagDecOS_idx!=0||TagDecSS_idx!=0) && TagDecTrue_idx==-1",
-                                    "Category2" : "(TagDecOS_idx!=0||TagDecSS_idx!=0) && TagDecTrue_idx==1",
-                                    "Color" : 1,
-                                    "Width" : 2,
-                                    "Legend" : "Monte Carlo"}
-
-    #Bootstrapped MC
-    configdict["Samples"]["BootstrappedMC"] = { "File" : "/eos/lhcb/wg/b2oc/TD_DPi_3fb/MCBootstrap/Bd2DPiMCFilteredS21RunIBothTaggedOnlyShortTime/Generator/BootstrapMC_Bd2DPiMCFilteredS21RunIBothTaggedOnlyShortTime_0.root",
-                                                "Workspace" : "workspace",
-                                                "Dataset" : "combData",
-                                                "Observable" : "BeautyTime",
-                                                "Category1" : "(TagDecOS_idx!=0||TagDecSS_idx!=0) && TagDecTrue_idx==-1",
-                                                "Category2" : "(TagDecOS_idx!=0||TagDecSS_idx!=0) && TagDecTrue_idx==1",
-                                                "Color" : 6,
-                                                "Width" : 2,
-                                                "Legend" : "Resampled Monte Carlo"}
-
-    #Toy generated using values fitted in original MC
-    configdict["Samples"]["Toy"] = { "File" : "/eos/lhcb/wg/b2oc/TD_DPi_3fb/Toys/FromMCFitSgnOnlyTrueTagProdDetAsymmAccMeanResTime04to12/Generator/GenToyWorkspace_FromMCFitSgnOnlyTrueTagProdDetAsymmAccMeanResTime04to12_0.root",
-                                     "Workspace" : "workspace",
-                                     "Dataprefix" : "dataSet",
-                                     "Decay" : "Bd2DPi",
-                                     "Sample" : "both",
-                                     "Mode" : "kpipi",
-                                     "Year" : "run1",
-                                     "Hypo" : "Bd2DPi",
-                                     "Merge" : "alreadyboth",
-                                     "Observable" : "BeautyTime",
-                                     "Category1" : "TagDecOS_idx==-1",
-                                     "Category2" : "TagDecOS_idx==1",
-                                     "Color" : 2,
-                                     "Width" : 2,
-                                     "Legend" : "Pseudoexperiment"}
-
-    #Analytical shape using parameters from fit to total MC
-    configdict["Functions"]["Fit"] = { "Expression" : "155.943+(806651.0-(1.1724e-13)*cos(0.51037*x))/(-5172.94+0.142483*cos(0.51037*x)+sin(0.51037*x))",
-                                       "Color" : 4,
-                                       "Width" : 2,
-                                       "Legend" : "Decay time fit to MC"}
-    
-    configdict["Plot"] = { "Bins" : [0.4,0.8,1.2,1.6,2.0,2.4,2.8,3.2,3.6,4.0,
-                                     4.5,5.0,5.5,6.0,7.0,8.0,9.0,10.0,12.0],
-                           "Range" : [0.4,12.0],
-                           "TitleX" : "#tau [ps]",
-                           "TitleY" : "A_{#font[12]{CP}}",
-                           "Legend" : [0.2,0.7,0.4,0.9]
-                           }
-
-    configdict["Label"] = {"X" : 0.55,
-                           "Y" : 0.875,
-                           "Text" : "LHCb Preliminary"}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForBootstrapMC.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForBootstrapMC.py
deleted file mode 100644
index 046a5f14708849832aa87d3767993f0b3fdbaf40..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForBootstrapMC.py
+++ /dev/null
@@ -1,105 +0,0 @@
-from ROOT import *
-
-def getconfig() :
-
-    configdict = {}
-    
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5220,    5600    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersConst_M_flat"}
-    
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.4,     12.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "obsTime"
-                                                      }
-    
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0,    999.0     ],
-                                                      "Name"                   : "BacPIDK",
-                                                      "InputName"              : "lab1_PIDKcorr"}
-    
-    configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-                                                      "Name"                   : "nTracks",
-                                                      "InputName"              : "nTracks"}
-    
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_TRUEID"}
-    
-    configdict["BasicVariables"]["TagDecTrue"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                        "Name"                   : "TagDecTrue",
-                                                        "InputName"              : "TrueTag"}
-    
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecOS",
-                                                      "InputName"              : "TagDecOS"}
-    
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecSS",
-                                                      "InputName"              : "obsTagSS"}
-
-    configdict["BasicVariables"]["MistagOS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagOS",
-                                                      "InputName"              : "MistagOS"}
-    
-    configdict["BasicVariables"]["MistagSS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagSS",
-                                                      "InputName"              : "obeEtaSS"}
-    
-    configdict["BasicVariables"]["BDTG"]           = { "Range"                  : [0.0, 1],
-                                                       "Name"                   : "BDTG",
-                                                       "InputName"              : "BDT_classifier"}
-    
-    #Additional variables not foreseen before
-    configdict["AdditionalVariables"] = {}
-    
-    configdict["AdditionalVariables"]["BeautyEta"]      = { "Range"                  : [ 1.5,    10.0     ],
-                                                            "Name"                   : "BeautyEta",
-                                                            "InputName"              : "lab0_LOKI_ETA"}
-    
-    configdict["AdditionalVariables"]["BeautyPT"]      = { "Range"        : [ 0.0,    10     ],
-                                                           "Name"                   : "nPV",
-                                                           "InputName"              : "nPV"}
-
-    configdict["AdditionalVariables"]["BeautyP"]      = { "Range"                  : [ 0.0,    3000000     ],
-                                                          "Name"                   : "BeautyP",
-                                                          "InputName"              : "lab0_P"}
-
-    configdict["AdditionalVariables"]["CharmTime"]    = { "Range"                  : [-10,     10    ],
-                                                          "Name"                   : "CharmTime",
-                                                          "InputName"              : "lab2_TAU"}
-
-    configdict["AdditionalVariables"]["nPV"]      = { "Range"                  : [ 0.0,    10     ],
-                                                      "Name"                   : "nPV",
-                                                      "InputName"              : "nPV"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo2BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo2BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo2BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo3BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo3BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo3BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo4BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo4BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo4BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["TriggerCategoryBroad"]      = { "Range"                  : [ 0.0,    10     ],
-                                                                       "Name"                   : "TriggerCategoryBroad",
-                                                                       "InputName"              : "TriggerCategoryBroad"}
-    
-
-    #"Cheated" tagging
-    configdict["cheatTagging"] = {}
-    configdict["cheatTagging"] = { "Efficiency" : 1.0,
-                                   "File"       : "/afs/cern.ch/user/v/vibattis/cmtuser/UraniaDev_v6r2p1/PhysFit/B2DXFitters/data/workspace/TemplateOS.root", #<eta>=0.370029
-                                   "Workspace"  : "workspace",
-                                   "Name"       : "TemplateOS",
-                                   "Obs"        : "MistagOS"
-                                   }
-    
-    return configdict
-                        
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForChangeHypo.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForChangeHypo.py
deleted file mode 100644
index 44e31e64e685981d68adee83c194f1d8107dda49..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForChangeHypo.py
+++ /dev/null
@@ -1,46 +0,0 @@
-from ROOT import *
-
-def getconfig() :
-
-    configdict = {}
-
-    from math import pi
-    from math import log
-
-    # PrefixID's: all the following fields are mandatory (choose either ID or newID for each particle)
-    # The number of Bachelors, Charm particles and Charm children is flexible
-    configdict["Charm1ChildrenPrefix"] = { "Child1"   : {"Name": "lab0_FitDaughtersConst_Dplus_P0",
-                                                         "ID": "K",
-                                                         "Type": "F"},
-
-                                           "Child2"   : {"Name": "lab0_FitDaughtersConst_Dplus_P1",
-                                                         "ID": "Pi",
-                                                         "Type": "F"},
-
-                                           "Child3"   : {"Name": "lab0_FitDaughtersConst_Dplus_P2",
-                                                         "ID": "Pi",
-                                                         "Type": "F"}
-                                           }
-
-    configdict["BeautyChildrenPrefix"] = { "Bachelor1" : {"Name": "lab0_FitDaughtersConst_P0",
-                                                          "newID": "K",
-                                                          "Type": "F"},
-
-                                           "Charm1"    : {"Name": "lab0_FitDaughtersConst_Dplus",
-                                                          "ID": "D",
-                                                          "Type": "F"}
-                                           }
-
-    configdict["BeautyPrefix"] = { "Name": "lab0_FitDaughtersConst",
-                                   "Type": "F"}
-
-    # Handle multiple candidates (if any). Comment out if not needed
-    #configdict["Index"] = "lab0_FitDaughtersConst_nPV"
-
-    #Additional "_pedix" in the branch name. Leave "" if not pedix is required
-    configdict["Pedix"] = "_flat"
-
-    #Mass name pedix (_M, _MM etc...)
-    configdict["MassPedix"] = "_M"
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForFinalStateAsymmetryTest.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForFinalStateAsymmetryTest.py
deleted file mode 100644
index d847e95adffc0944be6c001cfa21e9a149384318..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForFinalStateAsymmetryTest.py
+++ /dev/null
@@ -1,89 +0,0 @@
-def getconfig():
-
-    configdict = {}
-
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.4,     15.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_ctau_flat"}
-    configdict["BasicVariables"]["TagDecTrue"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                        "Name"                   : "TagDecTrue",
-                                                        "InputName"              : "TrueTag"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_TRUEID"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecOS",
-                                                      "InputName"              : "TagDecOS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecSS",
-                                                      "InputName"              : "TagDecSS"}
-
-    configdict["Samples"] = {}
-    configdict["Functions"] = {}
-
-    #Original MC
-    configdict["Samples"]["MC"] = { "File" : "/afs/cern.ch/work/v/vibattis/public/B2DX/Bd2DPi/Workspace/Nominal/work_dpi_mc_large_shorttime.root",
-                                    "Workspace" : "workspace",
-                                    "Dataprefix" : "dataSetMC_",
-                                    "Decay" : "Bd2DPi",
-                                    "Sample" : "both",
-                                    "Mode" : "kpipi",
-                                    "Year" : "run1",
-                                    "Hypo" : "Bd2DPi",
-                                    "Merge" : "both",
-                                    "Observable" : "BeautyTime",
-                                    "Category1" : "(TagDecOS_idx!=0||TagDecSS_idx!=0) && BacCharge_idx==1",
-                                    "Category2" : "(TagDecOS_idx!=0||TagDecSS_idx!=0) && BacCharge_idx==-1",
-                                    "Color" : 1,
-                                    "Width" : 2,
-                                    "Legend" : "Monte Carlo"}
-
-    #Bootstrapped MC
-    configdict["Samples"]["BootstrappedMC"] = { "File" : "/eos/lhcb/wg/b2oc/TD_DPi_3fb/MCBootstrap/Bd2DPiMCFilteredS21RunIBothTaggedOnlyShortTime/Generator/BootstrapMC_Bd2DPiMCFilteredS21RunIBothTaggedOnlyShortTime_0.root",
-                                                "Workspace" : "workspace",
-                                                "Dataset" : "combData",
-                                                "Observable" : "BeautyTime",
-                                                "Category1" : "(TagDecOS_idx!=0||TagDecSS_idx!=0) && BacCharge_idx==1",
-                                                "Category2" : "(TagDecOS_idx!=0||TagDecSS_idx!=0) && BacCharge_idx==-1",
-                                                "Color" : 6,
-                                                "Width" : 2,
-                                                "Legend" : "Resampled Monte Carlo"}
-
-    #Toy generated using values fitted in original MC
-    configdict["Samples"]["Toy"] = { "File" : "/eos/lhcb/wg/b2oc/TD_DPi_3fb/Toys/FromMCFitSgnOnlyTrueTagProdDetAsymmAccMeanResTime04to12/Generator/GenToyWorkspace_FromMCFitSgnOnlyTrueTagProdDetAsymmAccMeanResTime04to12_0.root",
-                                     "Workspace" : "workspace",
-                                     "Dataprefix" : "dataSet",
-                                     "Decay" : "Bd2DPi",
-                                     "Sample" : "both",
-                                     "Mode" : "kpipi",
-                                     "Year" : "run1",
-                                     "Hypo" : "Bd2DPi",
-                                     "Merge" : "alreadyboth",
-                                     "Observable" : "BeautyTime",
-                                     "Category1" : "BacCharge_idx==1",
-                                     "Category2" : "BacCharge_idx==-1",
-                                     "Color" : 2,
-                                     "Width" : 2,
-                                     "Legend" : "Pseudoexperiment"}
-
-    #Analytical shape using parameters from fit to total MC
-    configdict["Functions"]["Fit"] = { "Expression" : "0.0497423+(235.084+33.1477*cos(0.51037*x))/(-5172.94+0.142483*cos(0.51037*x)+sin(0.51037*x))",
-                                       "Color" : 4,
-                                       "Width" : 2,
-                                       "Legend" : "Decay time fit to MC"}
-    
-    configdict["Plot"] = { "Bins" : [0.4,0.8,1.2,1.6,2.0,2.4,2.8,3.2,3.6,4.0,
-                                     4.5,5.0,5.5,6.0,7.0,8.0,9.0,10.0,12.0],
-                           "Range" : [0.4,12.0],
-                           "TitleX" : "#tau [ps]",
-                           "TitleY" : "Raw charge asymmetry",
-                           "Legend" : [0.2,0.7,0.4,0.9]
-                           }
-
-    configdict["Label"] = {"X" : 0.55,
-                           "Y" : 0.875,
-                           "Text" : "LHCb Preliminary"}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMCAcceptance.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMCAcceptance.py
deleted file mode 100644
index 706b0deadc1f3ecf715e489b491d726d7f841048..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMCAcceptance.py
+++ /dev/null
@@ -1,31 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-
-    configdict["Time"] = { "Name": "obsTime",
-                           "Range": [0.4, 12.0],
-                           "Bins": 60
-                           }
-
-    # "Observables" has to contain the variables used in the "preselection" string, if any! 
-    configdict["Observables"] = { "lab0_BKGCAT" : {"Range": [-10.0, 10.0] },
-                                  "TagDecOS": {"Range": [-1.0, 1.0] },
-                                  "obsTagSS_PionInvBoost_ProtonInvBoost": {"Range": [-1.0, 1.0] },
-                                  "lab0_Hlt2Topo2BodyBBDTDecision_TOS" : {"Range": [0.0, 1.0] },
-                                  "lab0_Hlt2Topo3BodyBBDTDecision_TOS" : {"Range": [0.0, 1.0] },
-                                  "lab0_Hlt2Topo4BodyBBDTDecision_TOS" : {"Range": [0.0, 1.0] } }
-
-    configdict["Weight"] = "TMath::Exp(obsTime/1.519068)"
-
-    #New knots
-    #configdict["Acceptance"] = {"Knots": [ 0.5, 1.0, 1.5, 2.0, 2.25, 2.5, 2.75, 3.0, 3.5, 5.0, 10.0 ],
-    #                            "Coefficients" : [0.3889, 0.8, 0.9, 0.9, 0.9, 1.0, 1.0, 1.0, 1.1, 1.2, 1.1] }
-
-    configdict["Acceptance"] = {"Knots": [ 0.5, 1.0, 1.5, 2.0, 2.3, 2.6, 3.0, 4.0, 10.0 ],
-                                "Coefficients" : [0.3889, 0.8, 0.9, 0.9, 0.9, 1.0, 1.0, 1.0, 1.1] }
-
-    configdict["LHCbText"] = { "X": 0.75, "Y": 0.45}
-
-    configdict["Chi2Text"] = { "X": 0.35, "Y": 0.37}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMCAcceptanceFit.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMCAcceptanceFit.py
deleted file mode 100644
index d12a06c2d1a28a8b6b1d0ced52b1ec8b54d34740..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMCAcceptanceFit.py
+++ /dev/null
@@ -1,117 +0,0 @@
-"""configuration file for decaytime fit on signal bootstrapped MC"""
-def getconfig():
-
-    import math
-    from math import pi
-
-    configdict = {}
-
-    configdict["Decay"] = "Bd2DPi"
-
-    ############################################
-    # Define all basic variables
-    ############################################
-
-    configdict["BasicVariables"] = {}
-
-    configdict["BasicVariables"]["BeautyTime"]    = {"Range": [0.4, 12.0],
-                                                     "Bins": 40,
-                                                     "Name": "BeautyTime",  # the name is not used by the MDFitterSettings/Translator etc.
-                                                     "InputName": "obsTime"}
-    # if one wants to cut on the dataset the easiest way is to add a preselection in addition to the range defined here (preselection added
-    # by option --preselection on command line)
-
-    configdict["BasicVariables"]["BacCharge"]     = {"Range": [-1000.0, 1000.0],
-                                                     "Name": "BacCharge",
-                                                     "InputName": "BacCharge"}
-
-    configdict["BasicVariables"]["TagDecTrue"]      = {"Range": [-1.0, 1.0],
-                                                       "Name": "TagDecTrue",
-                                                       "InputName": "TagDecTrue"}
-
-    configdict["BasicVariables"]["TagDecOS"]      = {"Range": [-1.0, 1.0],
-                                                     "Name": "TagDecTrue",
-                                                     "InputName": "TagDecTrue"}
-
-    configdict["BasicVariables"]["TagDecSS"]      = {"Range": [-1.0, 1.0],
-                                                     "Name": "TagDecSS",
-                                                     "InputName": "TagDecSS"}
-    
-    ############################################
-    # Define all CPV and decay rate parameters
-    ############################################
-
-    # Parameters from https://svnweb.cern.ch/trac/lhcb/browser/DBASE/tags/Gen/DecFiles/v27r42/dkfiles/Bd_D-pi+,Kpipi=CPVDDalitz,DecProdCut.dec)
-    ModqOverp_d     = 1
-    ArgqOverp_d     = -0.746
-    ModpOverq_d     = 1
-    ArgpOverq_d     = 0.746
-    ModAf_d         = 0.0849
-    ArgAf_d         = 0.002278
-    ModAbarf_d      = 0.00137
-    ArgAbarf_d      = -1.128958
-    ModAfbar_d      = 0.00137
-    ArgAfbar_d      = 1.3145
-    ModAbarfbar_d   = 0.0849
-    ArgAbarfbar_d   = 0.002278
-    
-    configdict["ACP"] = {}
-    configdict["ACP"]["Signal"] = {"Gamma": [1.0 / 1.519068],
-                                   "DeltaGamma": [0.0],
-                                   "DeltaM": [0.510],
-                                   "C": [0.0],  # we neglect r^2 terms
-                                   "S": [0.0],  # from decfile
-                                   "Sbar": [0.0],  # from decfile
-                                   "D": [0.0],  # from DeltaGamma=0
-                                   "Dbar": [0.0],  # from DeltaGamma=0
-                                   "ParameteriseIntegral": True,
-                                   "CPlimit": {"upper": 2.0, "lower": -2.0},
-                                   "NBinsAcceptance": 0}  # keep at zero if using spline acceptance!
-                                                     
-    ############################################
-    # Define resolution and acceptance models
-    ############################################
-                                                     
-    configdict["ResolutionAcceptance"] = {}
-    configdict["ResolutionAcceptance"]["Signal"] = {}
-    configdict["ResolutionAcceptance"]["Signal"] = {"TimeErrorPDF": None,
-                                                    "Acceptance":  # From ANA note v2
-                                                    {"Type": "Spline",
-                                                     "Float": True,
-                                                     "Extrapolate": True,
-                                                     "KnotPositions": [0.5, 1.0, 1.5, 2.0, 2.3, 2.6, 3.0, 4.0, 10.0],
-                                                     "KnotCoefficients": [1.9440e-01, 3.3275e-01, 6.1444e-01, 8.6628e-01, 9.9600e-01, 1.0745e+00, 1.1083e+00,  1.1565e+00, 1.1946e+00]},
-                                                    "Resolution":  # From ANA note v2
-                                                    {"Type": "AverageModel",
-                                                     "Parameters": {'sigmas': [0.05491], 'fractions': []},
-                                                     "Bias": [0.0],
-                                                     "ScaleFactor": [1.0]}
-                                                    }
-
-    ############################################
-    # Define asymmetries
-    ############################################
-
-    configdict["ProductionAsymmetry"] = {}
-    configdict["DetectionAsymmetry"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = {}
-    configdict["DetectionAsymmetry"]["Signal"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = [0.0]
-    configdict["DetectionAsymmetry"]["Signal"] = [0.0]
-
-    ############################################
-    # Choose parameters to fix
-    ############################################
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Cf')
-    configdict["constParams"].append('Cfbar')
-    configdict["constParams"].append('Sf')
-    configdict["constParams"].append('Sfbar')
-    configdict["constParams"].append('Df')
-    configdict["constParams"].append('Dfbar')
-    configdict["constParams"].append('.*scalefactor')
-
-    configdict["constParams"].append('resmodel00_sigma')
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMCAcceptance_New2.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMCAcceptance_New2.py
deleted file mode 100644
index 706b0deadc1f3ecf715e489b491d726d7f841048..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMCAcceptance_New2.py
+++ /dev/null
@@ -1,31 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-
-    configdict["Time"] = { "Name": "obsTime",
-                           "Range": [0.4, 12.0],
-                           "Bins": 60
-                           }
-
-    # "Observables" has to contain the variables used in the "preselection" string, if any! 
-    configdict["Observables"] = { "lab0_BKGCAT" : {"Range": [-10.0, 10.0] },
-                                  "TagDecOS": {"Range": [-1.0, 1.0] },
-                                  "obsTagSS_PionInvBoost_ProtonInvBoost": {"Range": [-1.0, 1.0] },
-                                  "lab0_Hlt2Topo2BodyBBDTDecision_TOS" : {"Range": [0.0, 1.0] },
-                                  "lab0_Hlt2Topo3BodyBBDTDecision_TOS" : {"Range": [0.0, 1.0] },
-                                  "lab0_Hlt2Topo4BodyBBDTDecision_TOS" : {"Range": [0.0, 1.0] } }
-
-    configdict["Weight"] = "TMath::Exp(obsTime/1.519068)"
-
-    #New knots
-    #configdict["Acceptance"] = {"Knots": [ 0.5, 1.0, 1.5, 2.0, 2.25, 2.5, 2.75, 3.0, 3.5, 5.0, 10.0 ],
-    #                            "Coefficients" : [0.3889, 0.8, 0.9, 0.9, 0.9, 1.0, 1.0, 1.0, 1.1, 1.2, 1.1] }
-
-    configdict["Acceptance"] = {"Knots": [ 0.5, 1.0, 1.5, 2.0, 2.3, 2.6, 3.0, 4.0, 10.0 ],
-                                "Coefficients" : [0.3889, 0.8, 0.9, 0.9, 0.9, 1.0, 1.0, 1.0, 1.1] }
-
-    configdict["LHCbText"] = { "X": 0.75, "Y": 0.45}
-
-    configdict["Chi2Text"] = { "X": 0.35, "Y": 0.37}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMDFitterOnToys.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMDFitterOnToys.py
deleted file mode 100644
index 162783533806ff9810dd33c3b025b363cd1f8e37..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMDFitterOnToys.py
+++ /dev/null
@@ -1,440 +0,0 @@
-from ROOT import *
-
-def getconfig( samplemodeyear ) :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    import ROOT
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5090,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersConst_M_flat"}
-
-    #configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1910    ],
-    #                                                  "Name"                   : "CharmMass",
-    #                                                  "InputName"              : "lab0_FitwithoutConst_Dplus_M_flat"}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.4,     15.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_ctau_flat"}
-    
-    #configdict["BasicVariables"]["BacP"]          = { "Range"                  : [2000.0,  650000.0],
-    #                                                  "Name"                   : "BacP",
-    #                                                  "InputName"              : "lab0_FitDaughtersConst_P0_P_flat"}
-
-    #configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-    #                                                  "Name"                   : "BacPT",
-    #                                                  "InputName"              : "lab0_FitDaughtersConst_P0_PT_flat"}
-
-    #configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0, 999.0     ],
-    #                                                  "Name"                   : "BacPIDK",
-    #                                                  "InputName"              : "lab1_PIDK"}
-
-    #configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-    #                                                  "Name"                   : "nTracks",
-    #                                                  "InputName"              : "nTracks"}
-
-    #configdict["BasicVariables"]["BeautyTimeErr"] = { "Range"                  : [0.01,    0.1     ],
-    #                                                  "Name"                   : "BeautyTimeErr",
-    #                                                  "InputName"              : "lab0_FitDaughtersPVConst_ctauErr_flat"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_ID"}
-
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecOS",
-                                                      "InputName"              : "obsTagOS"}
-
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecSS",
-                                                      "InputName"              : "obsTagSSPionBDT"} 
-
-    configdict["BasicVariables"]["MistagOS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagOS",
-                                                      "InputName"              : "obsEtaOS"}
-
-    configdict["BasicVariables"]["MistagSS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagSS",
-                                                      "InputName"              : "obsEtaSSPionBDT"}
-
-    configdict["AdditionalVariables"] = {}
-    configdict["AdditionalVariables"]["TrueID"]   = { "Range"                  : [0.0, 1500.0],
-                                                      "InputName"              : "TrueID" }
-    
-    
-    configdict["constParams"] = []
-
-    #Useful constants
-    Pipeak = 5.27849e+03
-    Kpeak = 5.27907e+03
-
-    #Global variables (shared by different PDFs)
-    configdict["GlobalVariables"] = {}
-    configdict["GlobalVariables"]["eff_Bd2DPi_DPi"] = {}
-    configdict["GlobalVariables"]["eff_Bd2DPi_DPi"] = {"Type": "RooRealVar",
-                                                       "Title": "#epsilon^{D#pi}_{B_{d}#rightarrowD#pi}",
-                                                       "Range": [9.78927e-01, 0.8, 1.0],
-                                                       "Error": 0.0040223022512
-                                                       }
-    configdict["GlobalVariables"]["eff_Bd2DK_DK"] = {}
-    configdict["GlobalVariables"]["eff_Bd2DK_DK"] = {"Type": "RooRealVar",
-                                                     "Title": "#epsilon^{DK}_{B_{d}#rightarrowDK}",
-                                                     "Range": [6.29009e-01, 0.5, 0.8],
-                                                     "Error": 0.00653026432682
-                                                     }
-    configdict["GlobalVariables"]["Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo"] = {}
-    configdict["GlobalVariables"]["Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                             "Title": "B mass mean (#pi sample)",
-                                                                                             "Range": [Pipeak, 5.2e+03, 5.35e+03]
-                                                                                             }
-    configdict["GlobalVariables"]["Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DKHypo"] = {}
-    configdict["GlobalVariables"]["Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DKHypo"] = {"Type": "RooRealVar",
-                                                                                            "Title": "B mass mean (K sample)",
-                                                                                            "Range": [Kpeak, 5.2e+03, 5.35e+03]
-                                                                                            }
-    configdict["GlobalVariables"]["nSig_"+samplemodeyear+"_Bd2DPiHypo_Evts"] = {"Type": "RooRealVar",
-                                                                                "Title": "nSig_"+samplemodeyear+"_Bd2DPiHypo_Evts",
-                                                                                "Range": [5.2848e+05,300000,600000]
-                                                                                }
-    configdict["GlobalVariables"]["nSig_"+samplemodeyear+"_Bd2DKHypo_Evts"] = {"Type": "RooFormulaVar",
-                                                                               "Title": "nSig_"+samplemodeyear+"_Bd2DKHypo_Evts",
-                                                                               "Formula": "((1-@0)/@0)*@1",
-                                                                               "Dependents": ["eff_Bd2DPi_DPi", "nSig_"+samplemodeyear+"_Bd2DPiHypo_Evts"]
-                                                                               }
-    configdict["GlobalVariables"]["nBd2DK_"+samplemodeyear+"_Bd2DKHypo_Evts"] = {"Type": "RooRealVar",
-                                                                                 "Title": "nBd2DK_"+samplemodeyear+"_Bd2DKHypo_Evts",
-                                                                                 "Range": [3.0795e+04,20000,50000]
-                                                                                 }
-    configdict["GlobalVariables"]["nBd2DK_"+samplemodeyear+"_Bd2DPiHypo_Evts"] = {"Type": "RooFormulaVar",
-                                                                                  "Title": "nBd2DK_"+samplemodeyear+"_Evts",
-                                                                                  "Formula": "((1-@0)/@0)*@1",
-                                                                                  "Dependents": ["eff_Bd2DK_DK", "nBd2DK_"+samplemodeyear+"_Bd2DKHypo_Evts"]
-                                                                                  }
-    configdict["GlobalVariables"]["nBd2DKst_"+samplemodeyear+"_Bd2DKHypo_Evts"] = {"Type": "RooRealVar",
-                                                                                   "Title": "nBd2DKst_"+samplemodeyear+"_Bd2DKHypo_Evts",
-                                                                                   "Range": [3.7873e+03, 100, 10000],
-                                                                                   }
-    configdict["GlobalVariables"]["DRho_to_DKst_KHypo"] = {"Type": "RooRealVar",
-                                                           "Title": "DRho_to_DKst_KHypo",
-                                                           "Range": [8.5000e-01],#0.05,0.4],
-                                                           "Error": 0.04
-                                                           }
-    configdict["GlobalVariables"]["nBd2DRho_"+samplemodeyear+"_Bd2DKHypo_Evts"] = {"Type": "RooFormulaVar",
-                                                                                   "Title": "nBd2DRho_"+samplemodeyear+"_Bd2DKHypo_Evts",
-                                                                                   "Formula": "@0*@1",
-                                                                                   "Dependents": ["nBd2DKst_"+samplemodeyear+"_Bd2DKHypo_Evts","DRho_to_DKst_KHypo"] 
-                                                                                   }
-
-    configdict["GlobalVariables"]["Signal_Ipatia_BeautyMass_a1_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                  "Title": "Signal_Ipatia_BeautyMass_a1_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                                                  "Range": [1.56363e+00],
-                                                                                                  }
-    configdict["GlobalVariables"]["Signal_Ipatia_BeautyMass_a2_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                  "Title": "Signal_Ipatia_BeautyMass_a2_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                                                  "Range": [1.77887e+00],
-                                                                                                  }
-    configdict["GlobalVariables"]["Signal_Ipatia_BeautyMass_n1_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                  "Title": "Signal_Ipatia_BeautyMass_n1_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                                                  "Range": [4.04491e+00],
-                                                                                                  }
-    configdict["GlobalVariables"]["Signal_Ipatia_BeautyMass_n2_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                  "Title": "Signal_Ipatia_BeautyMass_n2_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                                                  "Range": [6.62043e+00],
-                                                                                                  }
-    configdict["GlobalVariables"]["Signal_Ipatia_BeautyMass_ascale_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                      "Title": "Signal_Ipatia_BeautyMass_ascale_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                                                      "Range": [1.0, 0.1, 1.9],
-                                                                                                      }
-    configdict["GlobalVariables"]["Signal_Ipatia_BeautyMass_nscale_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                      "Title": "Signal_Ipatia_BeautyMass_nscale_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                                                      "Range": [1.0, 0.1, 1.9],
-                                                                                                      }
-    
-    #PDF for each fitted component
-    #Structure: decay->hypo->observable
-    configdict["pdfList"] = {}
-    #
-    configdict["pdfList"]["Total"] = {}
-    configdict["pdfList"]["Total"]["Title"] = "Total"
-    configdict["pdfList"]["Total"]["Color"] = kBlue
-    configdict["pdfList"]["Total"]["Style"] = kSolid
-    #
-    configdict["pdfList"]["Signal"] = {}
-    configdict["pdfList"]["Signal"]["Title"] = "B_{d}#rightarrowD#pi"
-    configdict["pdfList"]["Signal"]["Color"] = kRed
-    configdict["pdfList"]["Signal"]["Style"] = kDashed
-    configdict["pdfList"]["Signal"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Signal"]["Bd2DPi"]["BeautyMass"] = { "PDF"        : "Ipatia",
-                                                                "shiftMean"  : False,
-                                                                "scaleTails" : True,
-                                                                "mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                "sigma"      : {"par": [1.96756e+01, 1.5e+01, 3.5e+01],
-                                                                                "title": ""},
-                                                                "zeta"       : {"par": [0.0],
-                                                                                "title": ""},
-                                                                "fb"         : {"par": [0.0],
-                                                                                "title": ""},
-                                                                "l"          : {"par": [-3.14504e+00],
-                                                                                "title": ""},
-                                                                "a1"         : "Signal_Ipatia_BeautyMass_a1_"+samplemodeyear+"_Bd2DPiHypo", #left
-                                                                "a2"         : "Signal_Ipatia_BeautyMass_a2_"+samplemodeyear+"_Bd2DPiHypo", #right
-                                                                "n1"         : "Signal_Ipatia_BeautyMass_n1_"+samplemodeyear+"_Bd2DPiHypo", #left
-                                                                "n2"         : "Signal_Ipatia_BeautyMass_a1_"+samplemodeyear+"_Bd2DPiHypo"}#right
-    
-    configdict["pdfList"]["Signal"]["Bd2DK"] = {}
-    configdict["pdfList"]["Signal"]["Bd2DK"]["BeautyMass"] = { "PDF"        : "Ipatia",
-                                                               "shiftMean"  : False,#True,
-                                                               "scaleTails" : False,
-                                                               "mean"       : {"par": [5.32740e+03,5.25e+03,5.45e+03],#"Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DKHypo",
-                                                                               "title": ""},
-                                                               #"shift"      : [5.32740e+03-Kpeak],
-                                                               "sigma"      : {"par": [2.42675e+01],
-                                                                               "title": ""},
-                                                               "zeta"       : {"par": [0.0],
-                                                                               "title": ""},
-                                                               "fb"         : {"par": [0.0],
-                                                                               "title": ""},
-                                                               "l"          : {"par": [-5.46421e+00],
-                                                                               "title": ""},
-                                                               "a1"         : {"par": [3.04325e+00],
-                                                                               "title": ""},
-                                                               "a2"         : {"par": [6.62837e-01],
-                                                                               "title": ""},
-                                                               "n1"         : {"par": [6.79609e-02],
-                                                                               "title": ""},
-                                                               "n2"         : {"par": [2.09572e+00],
-                                                                               "title": ""}}
-    #
-    configdict["pdfList"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DK"]["Title"] = "B_{d}#rightarrowDK"
-    configdict["pdfList"]["Bd2DK"]["Color"] = kBlack
-    configdict["pdfList"]["Bd2DK"]["Style"] = kDotted
-    configdict["pdfList"]["Bd2DK"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bd2DK"]["Bd2DPi"]["BeautyMass"] = { "PDF"        : "Ipatia",
-                                                               "shiftMean"  : False,#True,
-                                                               "scaleTails" : False,
-                                                               "mean"       : {"par": [5.23938e+03,5.15e+03,5.35e+03],#"Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                               "title": ""},
-                                                               #"shift"      : [5.23938e+03-Pipeak],
-                                                               "sigma"      : {"par": [2.59213e+01],
-                                                                               "title": ""},
-                                                               "zeta"       : {"par": [0.0],
-                                                                               "title": ""},
-                                                               "fb"         : {"par": [0.0],
-                                                                               "title": ""},
-                                                               "l"          : {"par": [-3.98519e+01],
-                                                                               "title": ""},
-                                                               "a1"         : {"par": [9.68988e-01],
-                                                                               "title": ""},
-                                                               "a2"         : {"par": [1.23156e+00],
-                                                                               "title": ""},
-                                                               "n1"         : {"par": [3.49691e+00],
-                                                                               "title": ""},
-                                                               "n2"         : {"par": [1.00524e+01],
-                                                                               "title": ""}}
-    configdict["pdfList"]["Bd2DK"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DK"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "Ipatia",
-                                                             "shiftMean"  : False,
-                                                             "scaleTails" : False,
-                                                             "mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DKHypo",
-                                                             "sigma"      : {"par": [1.74271e+01, 1.5e+01, 1.9e+01],
-                                                                             "title": ""},
-                                                             "zeta"       : {"par": [0.0],
-                                                                             "title": ""},
-                                                             "fb"         : {"par": [0.0],
-                                                                             "title": ""},
-                                                             "l"          : {"par": [-3.22645e+00],
-                                                                             "title": ""},
-                                                             "a1"         : {"par": [2.60724e+00],
-                                                                             "title": ""},
-                                                             "a2"         : {"par": [1.0e+09],
-                                                                             "title": ""},
-                                                             "n1"         : {"par": [1.00877e+00],
-                                                                             "title": ""},
-                                                             "n2"         : {"par": [0.0],
-                                                                             "title": ""}}
-    #
-    configdict["pdfList"]["Bd2DRho"] = {}
-    configdict["pdfList"]["Bd2DRho"]["Title"] = "B_{d}#rightarrowD#rho"
-    configdict["pdfList"]["Bd2DRho"]["Color"] = kMagenta
-    configdict["pdfList"]["Bd2DRho"]["Style"] = kDotted
-    configdict["pdfList"]["Bd2DRho"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bd2DRho"]["Bd2DPi"]["BeautyMass"] = {"PDF"        : "JohnsonSU",
-                                                                "shiftMean" : True,
-                                                                "mean"      : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                "shift"     : {"par": [4.71618e+03-Pipeak],
-                                                                               "title": ""},
-                                                                "sigma"     : {"par": [9.01304e+02],
-                                                                               "title": ""},
-                                                                "nu"        : {"par": [-2.01671e+00],
-                                                                               "title": ""},
-                                                                "tau"       : {"par": [1.29155e+00],
-                                                                               "title": ""}}
-    configdict["pdfList"]["Bd2DRho"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DRho"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "DoubleGaussian",
-                                                               "shiftMean"  : True,
-                                                               "sameMean"   : True,
-                                                               "mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DKHypo",
-                                                               "shift"      : {"par": [5.14019e+03-Kpeak],
-                                                                               "title": ""},
-                                                               "sigma1"     : {"par": [9.00002e+01],
-                                                                               "title": ""},
-                                                               "sigma2"     : {"par": [1.55484e+02],
-                                                                               "title": ""},
-                                                               "frac"       : {"par": [8.30742e-01],
-                                                                               "title": ""}}
-    #
-    configdict["pdfList"]["Bd2DstPi"] = {}
-    configdict["pdfList"]["Bd2DstPi"]["Title"] = "B_{d}#rightarrowD^{*}#pi"
-    configdict["pdfList"]["Bd2DstPi"]["Color"] = kGreen
-    configdict["pdfList"]["Bd2DstPi"]["Style"] = kDotted
-    configdict["pdfList"]["Bd2DstPi"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bd2DstPi"]["Bd2DPi"]["BeautyMass"] = {"PDF"         : "CrystalBallPlusGaussian",
-                                                                 "shiftMean"   : True,
-                                                                 "scaleWidths" : False,
-                                                                 "mean"        : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                 "shift"       : {"par": [5.10033e+03-Pipeak],
-                                                                                  "title": ""},
-                                                                 "alpha"       : {"par": [-1.63404e+00],
-                                                                                  "title": ""},
-                                                                 "n"           : {"par": [4.65946e+00],
-                                                                                  "title": ""},
-                                                                 "sigmaCB"     : {"par": [4.15131e+01],
-                                                                                  "title": ""},
-                                                                 "sigmaG"      : {"par": [1.79617e+01],
-                                                                                  "title": ""},
-                                                                 "fracG"       : {"par": [1.32304e-01],
-                                                                                  "title": ""}}
-    configdict["pdfList"]["Bd2DstPi"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DstPi"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "None"}
-    #
-    configdict["pdfList"]["Bd2DKst"] = {}
-    configdict["pdfList"]["Bd2DKst"]["Title"] = "B_{d}#rightarrowDK^{*}"
-    configdict["pdfList"]["Bd2DKst"]["Color"] = kPink
-    configdict["pdfList"]["Bd2DKst"]["Style"] = kDotted
-    configdict["pdfList"]["Bd2DKst"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bd2DKst"]["Bd2DPi"]["BeautyMass"] = {"PDF"       : "None"} 
-    configdict["pdfList"]["Bd2DKst"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DKst"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "Gaussian",
-                                                               "shiftMean"  : False,
-                                                               "mean"       : {"par": [5.08528e+03, 4.9e+03, 5.2e+03],
-                                                                               "title": ""},
-                                                               "sigma"      : {"par": [3.76140e+01, 1e+01, 6e+01],
-                                                                               "title": ""}}
-    #
-    configdict["pdfList"]["Comb"] = {}
-    configdict["pdfList"]["Comb"]["Title"] = "Combinatorial"
-    configdict["pdfList"]["Comb"]["Color"] = kBlue
-    configdict["pdfList"]["Comb"]["Style"] = kDotted
-    configdict["pdfList"]["Comb"]["Bd2DPi"] = {}
-    #configdict["pdfList"]["Comb"]["Bd2DPi"]["BeautyMass"] = { "PDF"          : "Exponential",
-    #                                                          "Title"        : "Combinatorial",
-    #                                                          "cB"           : [-2.27055e-03, -5.0e-03, -1.0e-03]}
-    configdict["pdfList"]["Comb"]["Bd2DPi"]["BeautyMass"] = { "PDF"          : "ExponentialPlusConstant",
-                                                              "Title"        : "Combinatorial",
-                                                              "cB"           : {"par": [-5.59102e-03, -15.0e-03, -1.0e-03],
-                                                                                "title": ""},
-                                                              "fracExpo"     : {"par": [8.77658e-01,0.3,0.99],
-                                                                                "title": ""}}
-    configdict["pdfList"]["Comb"]["Bd2DK"] = {}
-    configdict["pdfList"]["Comb"]["Bd2DK"]["BeautyMass"] = { "PDF"          : "ExponentialPlusConstant",
-                                                             "Title"        : "Combinatorial",
-                                                             "cB"           : {"par": [-4.15525e-03, -8.0e-03, -2.0e-03],
-                                                                               "title": ""},
-                                                             "fracExpo"     : {"par": [9.38575e-01,0.3,0.99],
-                                                                               "title": ""}}
-
-    #Axes titles
-    configdict["AxisTitle"] = {"BeautyMass": {"Bd2DPi":"D#pi mass (MeV/c^{2})",
-                                              "Bd2DK":"DK mass (MeV/c^{2})"}}
-
-    #Range
-    configdict["Range"] = {"BeautyMass": {"Range": [configdict["BasicVariables"]["BeautyMass"]["Range"][0],
-                                                    configdict["BasicVariables"]["BeautyMass"]["Range"][1]],
-                                          "Bins": 300}}#455}}
-
-    #Range and sample for sWeights
-    configdict["sWeights"] = {"Hypo" : "Bd2DPi",
-                              "Range" : {"BeautyMass" : [5220.0, 5600.0]},
-                              "Bins": 380
-                              }
-    
-    #Log scale
-    configdict["LogScale"] = {"BeautyMass": {"Bd2DPi" : [1e-03, 1e+05], "Bd2DK" : [1e-01, 1e+04] } }
-
-    #Some coordinates
-    configdict["Legend"] = {"Xmin" : 0.6,
-                            "Ymin" : 0.2,
-                            "Xmax" : 0.89,
-                            "Ymax" : 0.6}
-    configdict["LHCbText"] = {"X"    : 0.89,
-                              "Y"    : 0.8,
-                              "Text" : "LHCb Fast Simulation"}
-    configdict["Chi2"] = {"X"    : 0.6,
-                          "Y"    : 0.7}
-
-    #Yields
-    configdict["Yields"] = {"Signal"   : {"Bd2DPi"  : "nSig_"+samplemodeyear+"_Bd2DPiHypo_Evts",
-                                          "Bd2DK": "nSig_"+samplemodeyear+"_Bd2DKHypo_Evts"},
-                            "Bd2DK"    : {"Bd2DPi"  : "nBd2DK_"+samplemodeyear+"_Bd2DPiHypo_Evts",
-                                          "Bd2DK": "nBd2DK_"+samplemodeyear+"_Bd2DKHypo_Evts"},
-                            "Bd2DRho"  : {"Bd2DPi"  : {"par": [7.5224e+04,0,500000],
-                                                       "title": ""},
-                                          "Bd2DK": "nBd2DRho_"+samplemodeyear+"_Bd2DKHypo_Evts"},
-                            "Bd2DstPi" : {"Bd2DPi"  : {"par": [6.1404e+04,0,500000],
-                                                       "title": ""},
-                                          "Bd2DK": {"par":  [0],
-                                                    "title": ""}},
-                            "Bd2DKst"  : {"Bd2DPi"  : {"par": [0],
-                                                       "title": ""},
-                                          "Bd2DK": "nBd2DKst_"+samplemodeyear+"_Bd2DKHypo_Evts"},
-                            "Comb"     : {"Bd2DPi"  : {"par": [4.8362e+04,5000,500000],
-                                                       "title": ""},
-                                          "Bd2DK": {"par": [2.1674e+04,500,100000],
-                                                    "title": ""}}}
-
-    #Gaussian constraints
-    configdict["GaussianConstraints"] = {}
-    configdict["GaussianConstraints"]["Eff_Bd2DPi_DPi"] = {"Parameters" : ["eff_Bd2DPi_DPi"],
-                                                           "Mean"       : [configdict["GlobalVariables"]["eff_Bd2DPi_DPi"]["Range"][0]],
-                                                           "Covariance" : [configdict["GlobalVariables"]["eff_Bd2DPi_DPi"]["Error"]]}
-    configdict["GaussianConstraints"]["Eff_Bd2DK_DK"] = {"Parameters" : ["eff_Bd2DK_DK"],
-                                                         "Mean"       : [configdict["GlobalVariables"]["eff_Bd2DK_DK"]["Range"][0]],
-                                                         "Covariance" : [configdict["GlobalVariables"]["eff_Bd2DK_DK"]["Error"]]}
-    #configdict["GaussianConstraints"]["nDRho_to_DKst_KHypo"] = {"Parameters" : ["DRho_to_DKst_KHypo"],
-    #                                                            "Mean"       : [configdict["GlobalVariables"]["DRho_to_DKst_KHypo"]["Range"][0]],
-    #                                                            "Covariance" : [configdict["GlobalVariables"]["DRho_to_DKst_KHypo"]["Error"]]}
-
-    #Plot of the fit to compute sWeights
-    configdict["sWeightsFitPlot"] = {}
-    configdict["sWeightsFitPlot"]["Total"] = {"Color" : kBlue,
-                                              "Style" : kSolid,
-                                              "Title" : "Total"}
-    configdict["sWeightsFitPlot"]["Signal"] = {"Color" : kRed,
-                                               "Style" : kDashed,
-                                               "Title" : "Signal"}
-    configdict["sWeightsFitPlot"]["Background"] = {"Color" : kBlack,
-                                                   "Style" : kDotted,
-                                                   "Title" : "Background"}
-    
-    #sWeight plot
-    configdict["plotsWeights"] = {"BeautyTime" : "#tau(B_{d}#rightarrow D#pi) (ps)",
-                                  "CharmMass"  : "K#pi#pi mass (MeV/c^{2})"
-                                  }
-
-    #"Code" to identify the True ID for each component
-    configdict["TrueID"] = {"Signal"          : 100,
-                            "Bd2DK"           : 200,
-                            "Bd2DRho"         : 300,
-                            "Bd2DstPi"        : 400,
-                            "Bd2DKst"         : 500,
-                            "Comb"            : 600}
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMDFitterOnToys_Alex.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMDFitterOnToys_Alex.py
deleted file mode 100644
index ddda01dae4120cf8ecfe7d118c298df1747fdd25..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMDFitterOnToys_Alex.py
+++ /dev/null
@@ -1,387 +0,0 @@
-from ROOT import *
-
-def getconfig( samplemodeyear ) :
-
-    configdict = {}
-
-    from math import pi
-    from math import log
-
-    import ROOT
-
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5090,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersConst_M_flat"}
-
-    #configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1910    ],
-    #                                                  "Name"                   : "CharmMass",
-    #                                                  "InputName"              : "lab0_FitwithoutConst_Dplus_M_flat"}
-
-    # configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.2,     15.0    ],
-    #                                                   "Bins"                   : 40,
-    #                                                   "Name"                   : "BeautyTime",
-    #                                                   "InputName"              : "lab0_FitDaughtersPVConst_ctau_flat"}
-
-    #configdict["BasicVariables"]["BacP"]          = { "Range"                  : [2000.0,  650000.0],
-    #                                                  "Name"                   : "BacP",
-    #                                                  "InputName"              : "lab0_FitDaughtersConst_P0_P_flat"}
-
-    #configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-    #                                                  "Name"                   : "BacPT",
-    #                                                  "InputName"              : "lab0_FitDaughtersConst_P0_PT_flat"}
-
-    #configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0, 999.0     ],
-    #                                                  "Name"                   : "BacPIDK",
-    #                                                  "InputName"              : "lab1_PIDK"}
-
-    #configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-    #                                                  "Name"                   : "nTracks",
-    #                                                  "InputName"              : "nTracks"}
-
-    #configdict["BasicVariables"]["BeautyTimeErr"] = { "Range"                  : [0.01,    0.1     ],
-    #                                                  "Name"                   : "BeautyTimeErr",
-    #                                                  "InputName"              : "lab0_FitDaughtersPVConst_ctauErr_flat"}
-
-    # configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-    #                                                   "Name"                   : "BacCharge",
-    #                                                   "InputName"              : "lab1_ID"}
-
-    # configdict["BasicVariables"]["TagDecOS"]      = { "Range"                  : [-1.0,    1.0     ],
-    #                                                   "Name"                   : "TagDecOS",
-    #                                                   "InputName"              : "obsTagOS"}
-
-    # configdict["BasicVariables"]["TagDecSS"]      = { "Range"                  : [-1.0,    1.0     ],
-    #                                                   "Name"                   : "TagDecSS",
-    #                                                   "InputName"              : "obsTagSSPionBDT"}
-
-    # configdict["BasicVariables"]["MistagOS"]      = { "Range"                  : [ 0.0,    0.5     ],
-    #                                                   "Name"                   : "MistagOS",
-    #                                                   "InputName"              : "obsEtaOS"}
-
-    # configdict["BasicVariables"]["MistagSS"]      = { "Range"                  : [ 0.0,    0.5     ],
-    #                                                   "Name"                   : "MistagSS",
-    #                                                   "InputName"              : "obsEtaSSPionBDT"}
-
-    configdict["AdditionalVariables"] = {}
-    # configdict["AdditionalVariables"]["TrueID"]   = { "Range"                  : [0.0, 1500.0],
-    #                                                   "InputName"              : "TrueID" }
-
-
-    configdict["constParams"] = []
-
-    #Useful constants
-    Pipeak = 5.27849e+03
-    Kpeak = 5.27907e+03
-
-    #Global variables (shared by different PDFs)
-    configdict["GlobalVariables"] = {}
-    configdict["GlobalVariables"]["eff_Bd2DPi_DPi"] = {}
-    configdict["GlobalVariables"]["eff_Bd2DPi_DPi"] = {"Type": "RooRealVar",
-                                                       "Title": "#epsilon^{D#pi}_{B_{d}#rightarrowD#pi}",
-                                                       "Range": [9.78927e-01, 0.8, 1.0],
-                                                       "Error": 0.0040223022512
-                                                       }
-    configdict["GlobalVariables"]["eff_Bd2DK_DK"] = {}
-    configdict["GlobalVariables"]["eff_Bd2DK_DK"] = {"Type": "RooRealVar",
-                                                     "Title": "#epsilon^{DK}_{B_{d}#rightarrowDK}",
-                                                     "Range": [6.29009e-01, 0.5, 0.8],
-                                                     "Error": 0.00653026432682
-                                                     }
-    configdict["GlobalVariables"]["Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo"] = {}
-    configdict["GlobalVariables"]["Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                             "Title": "B mass mean (#pi sample)",
-                                                                                             "Range": [Pipeak, 5.2e+03, 5.35e+03]
-                                                                                             }
-    configdict["GlobalVariables"]["Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DKHypo"] = {}
-    configdict["GlobalVariables"]["Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DKHypo"] = {"Type": "RooRealVar",
-                                                                                            "Title": "B mass mean (K sample)",
-                                                                                            "Range": [Kpeak, 5.2e+03, 5.35e+03]
-                                                                                            }
-    configdict["GlobalVariables"]["nSig_"+samplemodeyear+"_Bd2DPiHypo_Evts"] = {"Type": "RooRealVar",
-                                                                                "Title": "nSig_"+samplemodeyear+"_Bd2DPiHypo_Evts",
-                                                                                "Range": [5.49162e+05,300000,600000]
-                                                                                }
-    configdict["GlobalVariables"]["nSig_"+samplemodeyear+"_Bd2DKHypo_Evts"] = {"Type": "RooFormulaVar",
-                                                                               "Title": "nSig_"+samplemodeyear+"_Bd2DKHypo_Evts",
-                                                                               "Formula": "((1-@0)/@0)*@1",
-                                                                               "Dependents": ["eff_Bd2DPi_DPi", "nSig_"+samplemodeyear+"_Bd2DPiHypo_Evts"]
-                                                                               }
-    configdict["GlobalVariables"]["nBd2DK_"+samplemodeyear+"_Bd2DKHypo_Evts"] = {"Type": "RooRealVar",
-                                                                                 "Title": "nBd2DK_"+samplemodeyear+"_Bd2DKHypo_Evts",
-                                                                                 "Range": [3.23144e+04,20000,50000]
-                                                                                 }
-    configdict["GlobalVariables"]["nBd2DK_"+samplemodeyear+"_Bd2DPiHypo_Evts"] = {"Type": "RooFormulaVar",
-                                                                                  "Title": "nBd2DK_"+samplemodeyear+"_Evts",
-                                                                                  "Formula": "((1-@0)/@0)*@1",
-                                                                                  "Dependents": ["eff_Bd2DK_DK", "nBd2DK_"+samplemodeyear+"_Bd2DKHypo_Evts"]
-                                                                                  }
-    configdict["GlobalVariables"]["nBd2DKst_"+samplemodeyear+"_Bd2DKHypo_Evts"] = {"Type": "RooRealVar",
-                                                                                   "Title": "nBd2DKst_"+samplemodeyear+"_Bd2DKHypo_Evts",
-                                                                                   "Range": [6.06144e+03, 100, 10000],
-                                                                                   }
-    configdict["GlobalVariables"]["DRho_to_DKst_KHypo"] = {"Type": "RooRealVar",
-                                                           "Title": "DRho_to_DKst_KHypo",
-                                                           "Range": [1.15744e-01],#0.05,0.4],
-                                                           "Error": 0.04
-                                                           }
-    configdict["GlobalVariables"]["nBd2DRho_"+samplemodeyear+"_Bd2DKHypo_Evts"] = {"Type": "RooFormulaVar",
-                                                                                   "Title": "nBd2DRho_"+samplemodeyear+"_Bd2DKHypo_Evts",
-                                                                                   "Formula": "@0*@1",
-                                                                                   "Dependents": ["nBd2DKst_"+samplemodeyear+"_Bd2DKHypo_Evts","DRho_to_DKst_KHypo"]
-                                                                                   }
-
-    configdict["GlobalVariables"]["Signal_Ipatia_BeautyMass_a1_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                  "Title": "Signal_Ipatia_BeautyMass_a1_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                                                  "Range": [1.56363e+00],
-                                                                                                  }
-    configdict["GlobalVariables"]["Signal_Ipatia_BeautyMass_a2_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                  "Title": "Signal_Ipatia_BeautyMass_a2_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                                                  "Range": [1.77887e+00],
-                                                                                                  }
-    configdict["GlobalVariables"]["Signal_Ipatia_BeautyMass_n1_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                  "Title": "Signal_Ipatia_BeautyMass_n1_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                                                  "Range": [4.04491e+00],
-                                                                                                  }
-    configdict["GlobalVariables"]["Signal_Ipatia_BeautyMass_n2_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                  "Title": "Signal_Ipatia_BeautyMass_n2_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                                                  "Range": [6.62043e+00],
-                                                                                                  }
-    configdict["GlobalVariables"]["Signal_Ipatia_BeautyMass_ascale_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                      "Title": "Signal_Ipatia_BeautyMass_ascale_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                                                      "Range": [1.0, 0.1, 1.9],
-                                                                                                      }
-    configdict["GlobalVariables"]["Signal_Ipatia_BeautyMass_nscale_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                      "Title": "Signal_Ipatia_BeautyMass_nscale_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                                                      "Range": [1.0, 0.1, 1.9],
-                                                                                                      }
-
-    #PDF for each fitted component
-    #Structure: decay->hypo->observable
-    configdict["pdfList"] = {}
-    #
-    configdict["pdfList"]["Total"] = {}
-    configdict["pdfList"]["Total"]["Title"] = "Total"
-    configdict["pdfList"]["Total"]["Color"] = kBlue
-    configdict["pdfList"]["Total"]["Style"] = kSolid
-    #
-    configdict["pdfList"]["Signal"] = {}
-    configdict["pdfList"]["Signal"]["Title"] = "B_{d}#rightarrowD#pi"
-    configdict["pdfList"]["Signal"]["Color"] = kRed
-    configdict["pdfList"]["Signal"]["Style"] = kDashed
-    configdict["pdfList"]["Signal"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Signal"]["Bd2DPi"]["BeautyMass"] = { "PDF"        : "Ipatia",
-                                                                "shiftMean"  : False,
-                                                                "scaleTails" : True,
-                                                                "mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                "sigma"      : [1.96756e+01, 1.5e+01, 3.5e+01],
-                                                                "zeta"       : [0.0],
-                                                                "fb"         : [0.0],
-                                                                "l"          : [-3.14504e+00],
-                                                                "a1"         : "Signal_Ipatia_BeautyMass_a1_"+samplemodeyear+"_Bd2DPiHypo", #left
-                                                                "a2"         : "Signal_Ipatia_BeautyMass_a2_"+samplemodeyear+"_Bd2DPiHypo", #right
-                                                                "n1"         : "Signal_Ipatia_BeautyMass_n1_"+samplemodeyear+"_Bd2DPiHypo", #left
-                                                                "n2"         : "Signal_Ipatia_BeautyMass_a1_"+samplemodeyear+"_Bd2DPiHypo"}#right
-
-    configdict["pdfList"]["Signal"]["Bd2DK"] = {}
-    configdict["pdfList"]["Signal"]["Bd2DK"]["BeautyMass"] = { "PDF"        : "Ipatia",
-                                                               "shiftMean"  : False,#True,
-                                                               "scaleTails" : False,
-                                                               "mean"       : [5.32740e+03,5.25e+03,5.45e+03],#"Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DKHypo",
-                                                               #"shift"      : [5.32740e+03-Kpeak],
-                                                               "sigma"      : [2.42675e+01],
-                                                               "zeta"       : [0.0],
-                                                               "fb"         : [0.0],
-                                                               "l"          : [-5.46421e+00],
-                                                               "a1"         : [3.04325e+00],
-                                                               "a2"         : [6.62837e-01],
-                                                               "n1"         : [6.79609e-02],
-                                                               "n2"         : [2.09572e+00]}
-
-    configdict["pdfList"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DK"]["Title"] = "B_{d}#rightarrowDK"
-    configdict["pdfList"]["Bd2DK"]["Color"] = kBlack
-    configdict["pdfList"]["Bd2DK"]["Style"] = kDotted
-    configdict["pdfList"]["Bd2DK"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bd2DK"]["Bd2DPi"]["BeautyMass"] = { "PDF"        : "Ipatia",
-                                                               "shiftMean"  : False,#True,
-                                                               "scaleTails" : False,
-                                                               "mean"       : [5.23938e+03,5.15e+03,5.35e+03],#"Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo",
-                                                               #"shift"      : [5.23938e+03-Pipeak],
-                                                               "sigma"      : [2.59213e+01],
-                                                               "zeta"       : [0.0],
-                                                               "fb"         : [0.0],
-                                                               "l"          : [-3.98519e+01],
-                                                               "a1"         : [9.68988e-01],
-                                                               "a2"         : [1.23156e+00],
-                                                               "n1"         : [3.49691e+00],
-                                                               "n2"         : [1.00524e+01]}
-    configdict["pdfList"]["Bd2DK"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DK"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "Ipatia",
-                                                             "shiftMean"  : False,
-                                                             "scaleTails" : False,
-                                                             "mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DKHypo",
-                                                             "sigma"      : [1.74271e+01, 1.5e+01, 1.9e+01],
-                                                             "zeta"       : [0.0],
-                                                             "fb"         : [0.0],
-                                                             "l"          : [-3.22645e+00],
-                                                             "a1"         : [2.60724e+00],
-                                                             "a2"         : [1.0e+09],
-                                                             "n1"         : [1.00877e+00],
-                                                             "n2"         : [0.0]}
-
-    configdict["pdfList"]["Bd2DRho"] = {}
-    configdict["pdfList"]["Bd2DRho"]["Title"] = "B_{d}#rightarrowD#rho"
-    configdict["pdfList"]["Bd2DRho"]["Color"] = kMagenta
-    configdict["pdfList"]["Bd2DRho"]["Style"] = kDotted
-    configdict["pdfList"]["Bd2DRho"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bd2DRho"]["Bd2DPi"]["BeautyMass"] = {"PDF"        : "JohnsonSU",
-                                                                "shiftMean" : True,
-                                                                "mean"      : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                "shift"     : [4.71618e+03-Pipeak],
-                                                                "sigma"     : [9.01304e+02],
-                                                                "nu"        : [-2.01671e+00],
-                                                                "tau"       : [1.29155e+00]}
-    configdict["pdfList"]["Bd2DRho"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DRho"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "DoubleGaussian",
-                                                               "shiftMean"  : True,
-                                                               "sameMean"   : True,
-                                                               "mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DKHypo",
-                                                               "shift"      : [5.14019e+03-Kpeak],
-                                                               "sigma1"     : [9.00002e+01],
-                                                               "sigma2"     : [1.55484e+02],
-                                                               "frac"       : [8.30742e-01]}
-    #
-    configdict["pdfList"]["Bd2DstPi"] = {}
-    configdict["pdfList"]["Bd2DstPi"]["Title"] = "B_{d}#rightarrowD^{*}#pi"
-    configdict["pdfList"]["Bd2DstPi"]["Color"] = kGreen
-    configdict["pdfList"]["Bd2DstPi"]["Style"] = kDotted
-    configdict["pdfList"]["Bd2DstPi"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bd2DstPi"]["Bd2DPi"]["BeautyMass"] = {"PDF"         : "CrystalBallPlusGaussian",
-                                                                 "shiftMean"   : True,
-                                                                 "mean"        : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                 "shift"       : [5.10033e+03-Pipeak],
-                                                                 "alpha"       : [-1.63404e+00],
-                                                                 "n"           : [4.65946e+00],
-                                                                 "sigmaCB"     : [4.15131e+01],
-                                                                 "sigmaG"      : [1.79617e+01],
-                                                                 "fracG"       : [1.32304e-01]}
-    configdict["pdfList"]["Bd2DstPi"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DstPi"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "None"}
-    #
-    configdict["pdfList"]["Bs2DsPi"] = {}
-    configdict["pdfList"]["Bs2DsPi"]["Title"] = "B_{s}#rightarrowD_{s}#pi"
-    configdict["pdfList"]["Bs2DsPi"]["Color"] = kCyan
-    configdict["pdfList"]["Bs2DsPi"]["Style"] = kDotted
-    configdict["pdfList"]["Bs2DsPi"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bs2DsPi"]["Bd2DPi"]["BeautyMass"] = {"PDF"        : "None"}
-    configdict["pdfList"]["Bs2DsPi"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bs2DsPi"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "None"}
-    #
-    configdict["pdfList"]["Bd2DKst"] = {}
-    configdict["pdfList"]["Bd2DKst"]["Title"] = "B_{d}#rightarrowDK^{*}"
-    configdict["pdfList"]["Bd2DKst"]["Color"] = kPink
-    configdict["pdfList"]["Bd2DKst"]["Style"] = kDotted
-    configdict["pdfList"]["Bd2DKst"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bd2DKst"]["Bd2DPi"]["BeautyMass"] = {"PDF"       : "None"}
-    configdict["pdfList"]["Bd2DKst"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DKst"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "Gaussian",
-                                                               "shiftMean"  : False,
-                                                               "mean"       : [5.08528e+03, 4.9e+03, 5.2e+03],
-                                                               "sigma"      : [3.76140e+01, 1e+01, 6e+01]}
-    #
-    configdict["pdfList"]["Comb"] = {}
-    configdict["pdfList"]["Comb"]["Title"] = "Combinatorial"
-    configdict["pdfList"]["Comb"]["Color"] = kBlue
-    configdict["pdfList"]["Comb"]["Style"] = kDotted
-    configdict["pdfList"]["Comb"]["Bd2DPi"] = {}
-    #configdict["pdfList"]["Comb"]["Bd2DPi"]["BeautyMass"] = { "PDF"          : "Exponential",
-    #                                                          "Title"        : "Combinatorial",
-    #                                                          "cB"           : [-2.27055e-03, -5.0e-03, -1.0e-03]}
-    configdict["pdfList"]["Comb"]["Bd2DPi"]["BeautyMass"] = { "PDF"          : "ExponentialPlusConstant",
-                                                              "Title"        : "Combinatorial",
-                                                              "cB"           : [-5.59102e-03, -15.0e-03, -1.0e-03],
-                                                              "fracExpo"     : [8.77658e-01,0.3,0.99]}
-    configdict["pdfList"]["Comb"]["Bd2DK"] = {}
-    configdict["pdfList"]["Comb"]["Bd2DK"]["BeautyMass"] = { "PDF"          : "ExponentialPlusConstant",
-                                                             "Title"        : "Combinatorial",
-                                                             "cB"           : [-4.15525e-03, -8.0e-03, -2.0e-03],
-                                                             "fracExpo"     : [9.38575e-01,0.3,0.99]}
-
-    #Axes titles
-    configdict["AxisTitle"] = {"BeautyMass": {"Bd2DPi":"D#pi mass (MeV/c^{2})",
-                                              "Bd2DK":"DK mass (MeV/c^{2})"}}
-
-    #Range
-    configdict["Range"] = {"BeautyMass": {"Range": [configdict["BasicVariables"]["BeautyMass"]["Range"][0],
-                                                    configdict["BasicVariables"]["BeautyMass"]["Range"][1]],
-                                          "Bins": 300}}#455}}
-
-    #Range and sample for sWeights
-    configdict["sWeights"] = {"Hypo" : "Bd2DPi",
-                              "Range" : {"BeautyMass" : [5220.0, 5600.0]},
-                              "Bins": 380
-                              }
-
-    #Log scale
-    configdict["LogScale"] = {"BeautyMass": {"Bd2DPi" : [1e-03, 1e+05], "Bd2DK" : [1e-01, 1e+04] } }
-
-    #Some coordinates
-    configdict["Legend"] = {"Xmin" : 0.6,
-                            "Ymin" : 0.2,
-                            "Xmax" : 0.89,
-                            "Ymax" : 0.6}
-    configdict["LHCbText"] = {"X"    : 0.89,
-                              "Y"    : 0.8,
-                              "Text" : "LHCb Fast Simulation"}
-    configdict["Chi2"] = {"X"    : 0.6,
-                          "Y"    : 0.7}
-
-    #Yields
-    configdict["Yields"] = {"Signal"   : {"Bd2DPi"  : "nSig_"+samplemodeyear+"_Bd2DPiHypo_Evts", "Bd2DK": "nSig_"+samplemodeyear+"_Bd2DKHypo_Evts"},
-                            "Bd2DK"    : {"Bd2DPi"  : "nBd2DK_"+samplemodeyear+"_Bd2DPiHypo_Evts", "Bd2DK": "nBd2DK_"+samplemodeyear+"_Bd2DKHypo_Evts"},
-                            "Bd2DRho"  : {"Bd2DPi"  : [7.40343e+04,0,500000], "Bd2DK": "nBd2DRho_"+samplemodeyear+"_Bd2DKHypo_Evts"},
-                            "Bd2DstPi" : {"Bd2DPi"  : [6.80954e+04,0,500000], "Bd2DK": [0]},
-                            "Bs2DsPi"  : {"Bd2DPi"  : [0], "Bd2DK": [0]},
-                            "Bd2DKst"  : {"Bd2DPi"  : [0], "Bd2DK": "nBd2DKst_"+samplemodeyear+"_Bd2DKHypo_Evts"},
-                            "Comb"     : {"Bd2DPi"  : [8.23965e+04,5000,500000], "Bd2DK": [2.40497e+04,500,100000]}}
-
-    #Gaussian constraints
-    configdict["GaussianConstraints"] = {}
-    configdict["GaussianConstraints"]["Eff_Bd2DPi_DPi"] = {"Parameters" : ["eff_Bd2DPi_DPi"],
-                                                           "Mean"       : [configdict["GlobalVariables"]["eff_Bd2DPi_DPi"]["Range"][0]],
-                                                           "Covariance" : [configdict["GlobalVariables"]["eff_Bd2DPi_DPi"]["Error"]]}
-    configdict["GaussianConstraints"]["Eff_Bd2DK_DK"] = {"Parameters" : ["eff_Bd2DK_DK"],
-                                                         "Mean"       : [configdict["GlobalVariables"]["eff_Bd2DK_DK"]["Range"][0]],
-                                                         "Covariance" : [configdict["GlobalVariables"]["eff_Bd2DK_DK"]["Error"]]}
-    #configdict["GaussianConstraints"]["nDRho_to_DKst_KHypo"] = {"Parameters" : ["DRho_to_DKst_KHypo"],
-    #                                                            "Mean"       : [configdict["GlobalVariables"]["DRho_to_DKst_KHypo"]["Range"][0]],
-    #                                                            "Covariance" : [configdict["GlobalVariables"]["DRho_to_DKst_KHypo"]["Error"]]}
-
-    #Plot of the fit to compute sWeights
-    configdict["sWeightsFitPlot"] = {}
-    configdict["sWeightsFitPlot"]["Total"] = {"Color" : kBlue,
-                                              "Style" : kSolid,
-                                              "Title" : "Total"}
-    configdict["sWeightsFitPlot"]["Signal"] = {"Color" : kRed,
-                                               "Style" : kDashed,
-                                               "Title" : "Signal"}
-    configdict["sWeightsFitPlot"]["Background"] = {"Color" : kBlack,
-                                                   "Style" : kDotted,
-                                                   "Title" : "Background"}
-
-    #sWeight plot
-    configdict["plotsWeights"] = {"BeautyTime" : "#tau(B_{d}#rightarrow D#pi) (ps)",
-                                  "CharmMass"  : "K#pi#pi mass (MeV/c^{2})"
-                                  }
-
-    #"Code" to identify the True ID for each component
-    configdict["TrueID"] = {"Signal"          : 100,
-                            "Bd2DK"           : 200,
-                            "Bd2DRho"         : 300,
-                            "Bd2DstPi"        : 400,
-                            "Bd2DKst"         : 500,
-                            "Comb"            : 600}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMDFitter_Bd.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMDFitter_Bd.py
deleted file mode 100644
index 485a554d7740f33eabae606c3bbdec06338a04f9..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMDFitter_Bd.py
+++ /dev/null
@@ -1,589 +0,0 @@
-from ROOT import *
-
-def getconfig( samplemodeyear ) :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    import ROOT
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5090,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersConst_M_flat"}
-
-    configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1904    ],
-                                                      "Name"                   : "CharmMass",
-                                                      "InputName"              : "lab0_FitwithoutConst_Dplus_M_flat"}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.4,     12.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_ctau_flat"}
-    
-    configdict["BasicVariables"]["BacP"]          = { "Range"                  : [2000.0,  650000.0],
-                                                      "Name"                   : "BacP",
-                                                      "InputName"              : "lab0_FitDaughtersConst_P0_P_flat"}
-
-    configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-                                                      "Name"                   : "BacPT",
-                                                      "InputName"              : "lab0_FitDaughtersConst_P0_PT_flat"}
-
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0, 999.0     ],
-                                                      "Name"                   : "BacPIDK",
-                                                      "InputName"              : "lab1_PIDK"}
-
-    configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-                                                      "Name"                   : "nTracks",
-                                                      "InputName"              : "nTracks"}
-    
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_ID"}
-    
-    configdict["BasicVariables"]["TagDecOSComb"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                          "Name"                   : "TagDecOSComb",
-                                                          "InputName"              : "obsTagOS"}
-
-    configdict["BasicVariables"]["TagDecOSCharm"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                           "Name"                   : "TagDecOSCharm",
-                                                           "InputName"              : "obsTagOSCharm"}
-
-    configdict["BasicVariables"]["TagDecSSPionBDTRaw"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                                "Name"                   : "TagDecSSPionBDT",
-                                                                "InputName"              : "lab0_SS_nnetKaon_DEC"}
-
-    configdict["BasicVariables"]["TagDecSSProtonRaw"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                               "Name"                   : "TagDecSSProton",
-                                                               "InputName"              : "lab0_OS_nnetKaon_DEC"}
-
-    configdict["BasicVariables"]["MistagOSComb"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                          "Name"                   : "MistagOSComb",
-                                                          "InputName"              : "obsEtaOS"}
-
-    configdict["BasicVariables"]["MistagOSCharm"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                           "Name"                   : "MistagOSCharm",
-                                                           "InputName"              : "obsEtaOSCharm"}
-
-    configdict["BasicVariables"]["MistagSSPionBDTRaw"]      = { "Range"                  : [ -1.0,    1.0     ],
-                                                                "Name"                   : "MistagSSPionBDTRaw",
-                                                                "InputName"              : "lab0_SS_nnetKaon_PROB"}
-
-    configdict["BasicVariables"]["MistagSSProtonRaw"]      = { "Range"                  : [ -1.0,    1.0     ],
-                                                               "Name"                   : "MistagSSProtonRaw",
-                                                               "InputName"              : "lab0_OS_nnetKaon_PROB"}
-
-    configdict["BasicVariables"]["BDTG"]           = { "Range"                  : [0.0, 1],
-                                                       "Name"                   : "BDTG",
-                                                       "InputName"              : "BDT_classifier"}
-
-    #Additional variables not foreseen before
-    configdict["AdditionalVariables"] = {}
-    
-    configdict["AdditionalVariables"]["BeautyPhi"]      = { "Range"                  : [ -10.,    10.     ],
-                                                            "Name"                   : "BeautyPhi",
-                                                            "InputName"              : "lab0_LOKI_PHI"}
-    
-    configdict["AdditionalVariables"]["BeautyEta"]      = { "Range"                  : [ 1.5,    10.0     ],
-                                                            "Name"                   : "BeautyEta",
-                                                            "InputName"              : "lab0_LOKI_ETA"}
-    
-    configdict["AdditionalVariables"]["BeautyPT"]      = { "Range"                  : [ 0.0,    100000     ],
-                                                           "Name"                   : "BeautyPT",
-                                                           "InputName"              : "lab0_PT"}
-
-    configdict["AdditionalVariables"]["BeautyP"]      = { "Range"                  : [ 0.0,    3000000     ],
-                                                          "Name"                   : "BeautyP",
-                                                          "InputName"              : "lab0_P"}
-
-    configdict["AdditionalVariables"]["CharmTime"]    = { "Range"                  : [-10,     10    ],
-                                                          "Name"                   : "CharmTime",
-                                                          "InputName"              : "lab2_TAU"}
-    
-    configdict["AdditionalVariables"]["nPV"]      = { "Range"                  : [ 0.0,    10     ],
-                                                      "Name"                   : "nPV",
-                                                      "InputName"              : "nPV"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo2BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo2BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo2BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo3BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo3BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo3BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo4BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo4BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo4BodyBBDTDecision_TOS"}
-
-    #Useful constants
-    Pipeak = 5.2803e+03
-    Kpeak = 5.2798e+03
-
-    #Global variables (shared by different PDFs)
-    configdict["GlobalVariables"] = {}
-    configdict["GlobalVariables"]["eff_Bd2DPi_DPi"] = {}
-    configdict["GlobalVariables"]["eff_Bd2DPi_DPi"] = {"Type": "RooRealVar",
-                                                       "Title": r"\epsilon_{\rm PID}(\Bz\to D\pi)_{\pi}",
-                                                       "Range": [0.979, 0.8, 1.0],
-                                                       "Error": 0.004
-                                                       }
-    configdict["GlobalVariables"]["eff_Bd2DK_DK"] = {}
-    configdict["GlobalVariables"]["eff_Bd2DK_DK"] = {"Type": "RooRealVar",
-                                                     "Title": r"\epsilon_{\rm PID}(\Bz\to DK)_{K}",
-                                                     "Range": [0.637, 0.5, 0.8],
-                                                     "Error": 0.007
-                                                     }
-    configdict["GlobalVariables"]["Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo"] = {}
-    configdict["GlobalVariables"]["Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                             "Title": r"\mu^{\pi}_{\Bz\to D\pi}",
-                                                                                             "Range": [Pipeak, 5.2e+03, 5.35e+03]
-                                                                                             }
-    configdict["GlobalVariables"]["Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DKHypo"] = {}
-    configdict["GlobalVariables"]["Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DKHypo"] = {"Type": "RooRealVar",
-                                                                                            "Title": r"\mu^{K}_{\Bz\to D\pi}",
-                                                                                            "Range": [Kpeak, 5.2e+03, 5.35e+03]
-                                                                                            }
-    configdict["GlobalVariables"]["nSig_"+samplemodeyear+"_Bd2DPiHypo_Evts"] = {"Type": "RooRealVar",
-                                                                                "Title": r"N^{\pi}_{\Bz\to D\pi}",
-                                                                                "Range": [500000,0,900000]
-                                                                                }
-    configdict["GlobalVariables"]["nSig_"+samplemodeyear+"_Bd2DKHypo_Evts"] = {"Type": "RooFormulaVar",
-                                                                               "Title": r"N^{K}_{\Bz\to D\pi}",
-                                                                               "Formula": "((1-@0)/@0)*@1",
-                                                                               "Dependents": ["eff_Bd2DPi_DPi", "nSig_"+samplemodeyear+"_Bd2DPiHypo_Evts"]
-                                                                               }
-    configdict["GlobalVariables"]["nBd2DK_"+samplemodeyear+"_Bd2DKHypo_Evts"] = {"Type": "RooRealVar",
-                                                                                 "Title": r"N^{K}_{\Bz\to DK}",
-                                                                                 "Range": [30000,0,500000]
-                                                                                 }
-    configdict["GlobalVariables"]["nBd2DK_"+samplemodeyear+"_Bd2DPiHypo_Evts"] = {"Type": "RooFormulaVar",
-                                                                                  "Title": r"N^{\pi}_{\Bz\to DK}",
-                                                                                  "Formula": "((1-@0)/@0)*@1",
-                                                                                  "Dependents": ["eff_Bd2DK_DK", "nBd2DK_"+samplemodeyear+"_Bd2DKHypo_Evts"]
-                                                                                  }
-    configdict["GlobalVariables"]["nBd2DKst_"+samplemodeyear+"_Bd2DKHypo_Evts"] = {"Type": "RooRealVar",
-                                                                                   "Title": r"N^{K}_{\Bz\to D\Kst}",
-                                                                                   "Range": [5000, 0, 100000],
-                                                                                   }
-    #configdict["GlobalVariables"]["DRho_to_DK_KHypo"] = {"Type": "RooRealVar",
-    #                                                     "Title": "DRho_to_DK_KHypo",
-    #                                                     "Range": [0.20],
-    #                                                     "Error": 0.4
-    #                                                     }
-
-    configdict["GlobalVariables"]["DRho_to_DKst_KHypo"] = {"Type": "RooRealVar",
-                                                           "Title": "DRho_to_DKst_KHypo",
-                                                           "Range": [0.93],
-                                                           "Error": 0.23
-                                                         }
-    
-    configdict["GlobalVariables"]["nBd2DRho_"+samplemodeyear+"_Bd2DKHypo_Evts"] = {"Type": "RooFormulaVar",
-                                                                                   "Title": r"N^{K}_{\Bz\to D\rho}",
-                                                                                   #"Range": [5000, 0, 100000],
-                                                                                   "Formula": "@0*@1",
-                                                                                   "Dependents": ["nBd2DKst_"+samplemodeyear+"_Bd2DKHypo_Evts","DRho_to_DKst_KHypo"] 
-                                                                                   }
-
-    #configdict["GlobalVariables"]["DsPi_to_DPi_PiHypo"] = {"Type": "RooRealVar",
-    #                                                       "Title": "DsPi_to_DPi_PiHypo",
-    #                                                       "Range": [0.019],
-    #                                                       "Error": 0.013
-    #                                                       }
-    #configdict["GlobalVariables"]["nBs2DsPi_"+samplemodeyear+"_Bd2DPiHypo_Evts"] = {"Type": "RooFormulaVar",
-    #                                                                                "Title": "nBs2DsPi_"+samplemodeyear+"_Bd2DPiHypo_Evts",
-    #                                                                                "Formula": "@0*@1",
-    #                                                                                "Dependents": ["nSig_"+samplemodeyear+"_Bd2DPiHypo_Evts","DsPi_to_DPi_PiHypo"]
-    #                                                                                }
-    
-    configdict["GlobalVariables"]["Signal_IpatiaPlusJohnsonSU_BeautyMass_a1_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                           "Title": r"a1^{\pi}_{\Bz\to D\pi}",
-                                                                                                           "Range": [7.2205e-01],
-                                                                                                           }
-    configdict["GlobalVariables"]["Signal_IpatiaPlusJohnsonSU_BeautyMass_a2_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                           "Title": r"a2^{\pi}_{\Bz\to D\pi}",
-                                                                                                           "Range": [9.6101e-01],
-                                                                                                           }
-    configdict["GlobalVariables"]["Signal_IpatiaPlusJohnsonSU_BeautyMass_n1_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                           "Title": r"n1^{\pi}_{\Bz\to D\pi}",
-                                                                                                           "Range": [5.9199e+00],
-                                                                                                           }
-    configdict["GlobalVariables"]["Signal_IpatiaPlusJohnsonSU_BeautyMass_n2_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                           "Title": r"n2^{\pi}_{\Bz\to D\pi}",
-                                                                                                           "Range": [5.8254e+00],
-                                                                                                           }
-    configdict["GlobalVariables"]["Signal_IpatiaPlusJohnsonSU_BeautyMass_ascale_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                               "Title": r"sa^{\pi}_{\Bz\to D\pi}",
-                                                                                                               "Range": [1.0, 0.1, 10.0],
-                                                                                                               }
-    configdict["GlobalVariables"]["Signal_IpatiaPlusJohnsonSU_BeautyMass_nscale_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                               "Title": r"sn^{\pi}_{\Bz\to D\pi}",
-                                                                                                               "Range": [1.0, 0.1, 10.0],
-                                                                                                               }
-    configdict["GlobalVariables"]["Bd2DK_Ipatia_BeautyMass_a1_"+samplemodeyear+"_Bd2DKHypo"] = {"Type": "RooRealVar",
-                                                                                                "Title": r"a1^{K}_{\Bz\to DK}",
-                                                                                                "Range": [2.3381e+00],
-                                                                                                }
-    configdict["GlobalVariables"]["Bd2DK_Ipatia_BeautyMass_a2_"+samplemodeyear+"_Bd2DKHypo"] = {"Type": "RooRealVar",
-                                                                                                "Title": r"a2^{K}_{\Bz\to DK}",
-                                                                                                "Range": [1.0e+09],
-                                                                                                 }
-    configdict["GlobalVariables"]["Bd2DK_Ipatia_BeautyMass_n1_"+samplemodeyear+"_Bd2DKHypo"] = {"Type": "RooRealVar",
-                                                                                                "Title": r"n1^{K}_{\Bz\to DK}",
-                                                                                                "Range": [1.5601e+00],
-                                                                                                }
-    configdict["GlobalVariables"]["Bd2DK_Ipatia_BeautyMass_n2_"+samplemodeyear+"_Bd2DKHypo"] = {"Type": "RooRealVar",
-                                                                                                "Title": r"n2^{K}_{\Bz\to DK}",
-                                                                                                "Range": [0.0],
-                                                                                                }
-    #configdict["GlobalVariables"]["Bd2DK_Ipatia_BeautyMass_ascale_"+samplemodeyear+"_Bd2DKHypo"] = {"Type": "RooRealVar",
-    #                                                                                                "Title": r"sa^{K}_{\Bz\to DK}",
-    #                                                                                                "Range": [1.0, 0.1, 1.9],
-    #                                                                                                }
-    #configdict["GlobalVariables"]["Bd2DK_Ipatia_BeautyMass_nscale_"+samplemodeyear+"_Bd2DKHypo"] = {"Type": "RooRealVar",
-    #                                                                                                "Title": r"sn^{K}_{\Bz\to DK}",
-    #                                                                                                "Range": [1.0, 0.1, 1.9],
-    #                                                                                                }
-    
-    #PDF for each fitted component
-    #Structure: decay->hypo->observable
-    configdict["pdfList"] = {}
-    #
-    configdict["pdfList"]["Total"] = {}
-    configdict["pdfList"]["Total"]["Title"] = "Total"
-    configdict["pdfList"]["Total"]["Color"] = kBlue
-    configdict["pdfList"]["Total"]["Style"] = kSolid
-    #
-    configdict["pdfList"]["Signal"] = {}
-    configdict["pdfList"]["Signal"]["Title"] = "B_{d}#rightarrowD#pi"
-    configdict["pdfList"]["Signal"]["Color"] = kRed
-    configdict["pdfList"]["Signal"]["Style"] = kDashed
-    configdict["pdfList"]["Signal"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Signal"]["Bd2DPi"]["BeautyMass"] = { "PDF"        : "IpatiaPlusJohnsonSU",
-                                                                "shiftMean"  : False,
-                                                                "scaleTails" : True,
-                                                                "mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                "sigmaI"     : {"par": [4.3925e+01, 1.5e+01, 8.5e+01],
-                                                                                "title": r"\sigmaI^{\pi}_{\Bz\to D\pi}"},
-                                                                "sigmaJ"     : {"par": [1.6824e+01, 1.0e+01, 3.4e+01],
-                                                                                "title": r"\sigmaJ^{\pi}_{\Bz\to D\pi}"},
-                                                                "zeta"       : {"par": [0.0],
-                                                                                "title": r"\zeta^{\pi}_{\Bz\to D\pi}"},
-                                                                "fb"         : {"par": [0.0],
-                                                                                "title": r"\beta^{\pi}_{\Bz\to D\pi}"},
-                                                                "l"          : {"par": [-1.2397e+00],
-                                                                                "title" : "\lambda^{\pi}_{\Bz\to D\pi}"},
-                                                                "a1"         : "Signal_IpatiaPlusJohnsonSU_BeautyMass_a1_"+samplemodeyear+"_Bd2DPiHypo", #left
-                                                                "a2"         : "Signal_IpatiaPlusJohnsonSU_BeautyMass_a2_"+samplemodeyear+"_Bd2DPiHypo", #right
-                                                                "n1"         : "Signal_IpatiaPlusJohnsonSU_BeautyMass_n1_"+samplemodeyear+"_Bd2DPiHypo", #left
-                                                                "n2"         : "Signal_IpatiaPlusJohnsonSU_BeautyMass_n2_"+samplemodeyear+"_Bd2DPiHypo",#right,
-                                                                "nu"         : {"par": [-1.0506e-01],
-                                                                                "title": r"\nu^{\pi}_{\Bz\to D\pi}"},
-                                                                "tau"        : {"par": [3.2598e-01],
-                                                                                "title": r"\tau^{\pi}_{\Bz\to D\pi}"},
-                                                                "fracI"      : {"par": [4.3622e-01],
-                                                                                "title": r"f^{\pi}_{\Bz\to D\pi}"}}
-    
-    configdict["pdfList"]["Signal"]["Bd2DK"] = {}
-    configdict["pdfList"]["Signal"]["Bd2DK"]["BeautyMass"] = { "PDF"        : "Ipatia",
-                                                               "shiftMean"  : False,
-                                                               "scaleTails" : False,
-                                                               "mean"       : {"par": [5.3365e+03,5.25e+03,5.45e+03],
-                                                                               "title" : r"\mu^{K}_{\Bz\to D\pi}"},
-                                                               "sigma"      : {"par": [2.3972e+01],
-                                                                                "title" : r"\sigma^{K}_{\Bz\to D\pi}"},
-                                                               "zeta"       : {"par": [0.0],
-                                                                                "title" : r"\zeta^{K}_{\Bz\to D\pi}"},
-                                                               "fb"         : {"par": [0.0],
-                                                                                "title" : r"\beta^{K}_{\Bz\to D\pi}"},
-                                                               "l"          : {"par": [-3.7704e+00],
-                                                                                "title" : r"\lambda^{K}_{\Bz\to D\pi}"},
-                                                               "a1"         : {"par": [3.1436e+00],
-                                                                                "title" : r"a11^{K}_{\Bz\to D\pi}"},
-                                                               "a2"         : {"par": [5.6856e-01],
-                                                                                "title" : r"a21^{K}_{\Bz\to D\pi}"},
-                                                               "n1"         : {"par": [4.7325e-02],
-                                                                                "title" : r"n11^{K}_{\Bz\to D\pi}"},
-                                                               "n2"         : {"par": [2.8096e+00],
-                                                                               "title": r"n21^{K}_{\Bz\to D\pi}"}}
-    #
-    configdict["pdfList"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DK"]["Title"] = "B_{d}#rightarrowDK"
-    configdict["pdfList"]["Bd2DK"]["Color"] = kBlack
-    configdict["pdfList"]["Bd2DK"]["Style"] = kDotted
-    configdict["pdfList"]["Bd2DK"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bd2DK"]["Bd2DPi"]["BeautyMass"] = { "PDF"        : "Ipatia",
-                                                               "shiftMean"  : False,
-                                                               "scaleTails" : False,
-                                                               "mean"       : {"par": [5.2400e+03,5.15e+03,5.35e+03],
-                                                                               "title" : r"\mu^{\pi}_{\Bz\to DK}"},
-                                                               "sigma"      : {"par": [2.3434e+01],
-                                                                               "title" : r"\sigma^{\pi}_{\Bz\to DK}"},
-                                                               "zeta"       : {"par": [0.0],
-                                                                               "title" : r"\zeta^{\pi}_{\Bz\to DK}"},
-                                                               "fb"         : {"par": [0.0],
-                                                                               "title" : r"\beta^{\pi}_{\Bz\to DK}"},
-                                                               "l"          : {"par": [-2.3916e+01],
-                                                                               "title" : r"\lambda^{\pi}_{\Bz\to DK}"},
-                                                               "a1"         : {"par": [8.9842e-01],
-                                                                               "title" : r"a1^{\pi}_{\Bz\to DK}"},
-                                                               "a2"         : {"par": [1.0920e+00],
-                                                                               "title" : r"a2^{\pi}_{\Bz\to DK}"},
-                                                               "n1"         : {"par": [3.8290e+00],
-                                                                               "title" : r"n1^{\pi}_{\Bz\to DK}"},
-                                                               "n2"         : {"par": [2.1980e+01],
-                                                                               "title" : r"n2^{\pi}_{\Bz\to DK}"}}
-    configdict["pdfList"]["Bd2DK"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DK"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "Ipatia",
-                                                             "shiftMean"  : False,
-                                                             "scaleTails" : False,
-                                                             "mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DKHypo",
-                                                             "sigma"      : {"par": [1.7320e+01, 0.5e+01, 6e+01],
-                                                                             "title": r"\sigma^{K}_{\Bz\to DK}"},
-                                                             "zeta"       : {"par": [0.0],
-                                                                             "title" : r"\zeta^{K}_{\Bz\to DK}"},
-                                                             "fb"         : {"par": [0.0],
-                                                                             "title" : r"\beta^{K}_{\Bz\to DK}"},
-                                                             "l"          : {"par": [-3.4455e+00],
-                                                                             "title" : r"\lambda^{K}_{\Bz\to DK}"},
-                                                             "a1"         : "Bd2DK_Ipatia_BeautyMass_a1_"+samplemodeyear+"_Bd2DKHypo",
-                                                             "a2"         : "Bd2DK_Ipatia_BeautyMass_a2_"+samplemodeyear+"_Bd2DKHypo",
-                                                             "n1"         : "Bd2DK_Ipatia_BeautyMass_n1_"+samplemodeyear+"_Bd2DKHypo",
-                                                             "n2"         : "Bd2DK_Ipatia_BeautyMass_n2_"+samplemodeyear+"_Bd2DKHypo"
-                                                             }
-    #
-    configdict["pdfList"]["Bd2DRho"] = {}
-    configdict["pdfList"]["Bd2DRho"]["Title"] = "B_{d}#rightarrowD#rho"
-    configdict["pdfList"]["Bd2DRho"]["Color"] = kMagenta
-    configdict["pdfList"]["Bd2DRho"]["Style"] = kDotted
-    configdict["pdfList"]["Bd2DRho"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bd2DRho"]["Bd2DPi"]["BeautyMass"] = {"PDF"        : "JohnsonSU",
-                                                                "shiftMean" : True,
-                                                                "mean"      : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                "shift"     : {"par": [4.8278e+03-Pipeak],
-                                                                               "title" : r"\Delta\mu^{\pi}_{\Bz\to D\rho}"},
-                                                                "sigma"     : {"par": [5.4939e+02],
-                                                                               "title" : r"\sigma^{\pi}_{\Bz\to D\rho}"},
-                                                                "nu"        : {"par": [-2.0121e+00],
-                                                                               "title" : r"\nu^{\pi}_{\Bz\to D\rho}"},
-                                                                "tau"       : {"par": [1.1632e+00],
-                                                                               "title" : r"\tau^{\pi}_{\Bz\to D\rho}"}}
-    configdict["pdfList"]["Bd2DRho"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DRho"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "DoubleGaussian",
-                                                               "shiftMean"  : True,
-                                                               "sameMean"   : True,
-                                                               "mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DKHypo",
-                                                               "shift"      : {"par": [5.1094e+03-Kpeak],
-                                                                               "title" : r"\Delta\mu^{K}_{\Bz\to D\rho}"},
-                                                               #"mean"      : {"par": [5.1316e+03, 5000, 6000],
-                                                               #               "title" : r"\mu^{K}_{\Bz\to D\rho}"},
-                                                               "sigma1"     : {"par": [1.1656e+02],
-                                                                               "title" : r"\sigma 1\mu^{K}_{\Bz\to D\rho}"},
-                                                               "sigma2"     : {"par": [4.4513e+01],
-                                                                               "title" : r"\sigma 2^{K}_{\Bz\to D\rho}"},
-                                                               "frac"       : {"par": [2.1017e-01],
-                                                                               "title" : r"f^{K}_{\Bz\to D\rho}"}}
-    #
-    configdict["pdfList"]["Bd2DstPi"] = {}
-    configdict["pdfList"]["Bd2DstPi"]["Title"] = "B_{d}#rightarrowD^{*}#pi"
-    configdict["pdfList"]["Bd2DstPi"]["Color"] = kGreen
-    configdict["pdfList"]["Bd2DstPi"]["Style"] = kDotted
-    configdict["pdfList"]["Bd2DstPi"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bd2DstPi"]["Bd2DPi"]["BeautyMass"] = {"PDF"         : "CrystalBallPlusGaussian",
-                                                                 "shiftMean"   : True,
-                                                                 "scaleWidths" : False,
-                                                                 "mean"        : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                 "shift"       : {"par": [5.1009e+03-Pipeak],
-                                                                                  "title" : r"\Delta\mu^{\pi}_{\Bz\to \Dst\pi}"},
-                                                                 "alpha"       : {"par": [-1.4432e+00],
-                                                                                  "title" : r"\alpha^{\pi}_{\Bz\to \Dst\pi}"},
-                                                                 "n"           : {"par": [4.6477e+00],
-                                                                                  "title" : r"n^{\pi}_{\Bz\to \Dst\pi}"},
-                                                                 "sigmaCB"     : {"par": [2.5844e+01],
-                                                                                  "title" : r"\sigma CB^{\pi}_{\Bz\to \Dst\pi}"},
-                                                                 "sigmaG"      : {"par": [1.6520e+01],
-                                                                                  "title" : r"\sigma G^{\pi}_{\Bz\to \Dst\pi}"},
-                                                                 "fracG"       : {"par": [3.0218e-01],
-                                                                                  "title" : r"f^{\pi}_{\Bz\to \Dst\pi}"}}
-    configdict["pdfList"]["Bd2DstPi"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DstPi"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "None"}
-    #
-    configdict["pdfList"]["Bs2DsPi"] = {}
-    configdict["pdfList"]["Bs2DsPi"]["Title"] = "B_{s}#rightarrowD_{s}#pi"
-    configdict["pdfList"]["Bs2DsPi"]["Color"] = kCyan
-    configdict["pdfList"]["Bs2DsPi"]["Style"] = kDotted
-    configdict["pdfList"]["Bs2DsPi"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bs2DsPi"]["Bd2DPi"]["BeautyMass"] = {"PDF"        : "None"}#{"PDF"        : "Ipatia",
-                                                                #"shiftMean"  : True,
-                                                                #"scaleTails" : False,
-                                                                #"mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                #"shift"      : {"par": [5312.13-Pipeak],
-                                                                #                "title": r"\Delta\mu^{\pi}_{B_{s}\to D_{s}\pi}"},
-                                                                #"sigma"      : {"par": [25.6861],
-                                                                #                "title": r"\sigma^{\pi}_{B_{s}\to D_{s}\pi}"},
-                                                                #"zeta"       : {"par": [0.0],
-                                                                #                "title": r"\zeta\mu^{\pi}_{B_{s}\to D_{s}\pi}"},
-                                                                #"fb"         : {"par": [0.0],
-                                                                #                "title": r"\beta^{\pi}_{B_{s}\to D_{s}\pi}"},
-                                                                #"l"          : {"par": [-9.99936],
-                                                                #                "title": r"l^{\pi}_{B_{s}\to D_{s}\pi}"},
-                                                                #"a1"         : {"par": [0.888263],
-                                                                #                "title": r"a1^{\pi}_{B_{s}\to D_{s}\pi}"},
-                                                                #"a2"         : {"par": [3.03441],
-                                                                #                "title": r"a2^{\pi}_{B_{s}\to D_{s}\pi}"},
-                                                                #"n1"         : {"par": [5.26049],
-                                                                #                "title": r"n1^{\pi}_{B_{s}\to D_{s}\pi}"},
-                                                                #"n2"         : {"par": [1.22319],
-                                                                #                "title": r"n2^{\pi}_{B_{s}\to D_{s}\pi}"}}
-    
-    configdict["pdfList"]["Bs2DsPi"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bs2DsPi"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "None"}
-    #
-    configdict["pdfList"]["Bd2DKst"] = {}
-    configdict["pdfList"]["Bd2DKst"]["Title"] = "B_{d}#rightarrowD^{(*)}K^{(*)}/#pi"
-    configdict["pdfList"]["Bd2DKst"]["Color"] = kGreen
-    configdict["pdfList"]["Bd2DKst"]["Style"] = kDotted
-    configdict["pdfList"]["Bd2DKst"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bd2DKst"]["Bd2DPi"]["BeautyMass"] = {"PDF"       : "None"} 
-    configdict["pdfList"]["Bd2DKst"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DKst"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "Gaussian",
-                                                               "shiftMean"  : False,#True,
-                                                               #"mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DKHypo",
-                                                               #"shift"       : {"par": [5.1077e+03-Kpeak],
-                                                               #                 "title" : r"\Delta\mu^{K}_{\Bz\to D\Kst}"},
-                                                               "mean"       : {"par": [5.1077e+03, 4.8e+03, 5.5e+03],
-                                                                               "title" : r"\mu^{K}_{\Bz\to D\Kst}"},
-                                                               "sigma"      : {"par": [2.8878e+01, 1e+01, 6e+01],
-                                                                                "title" : r"\sigma^{K}_{\Bz\to D\Kst}"}}
-    #
-    configdict["pdfList"]["Comb"] = {}
-    configdict["pdfList"]["Comb"]["Title"] = "Combinatorial"
-    configdict["pdfList"]["Comb"]["Color"] = kBlue
-    configdict["pdfList"]["Comb"]["Style"] = kDotted
-    configdict["pdfList"]["Comb"]["Bd2DPi"] = {}
-    #configdict["pdfList"]["Comb"]["Bd2DPi"]["BeautyMass"] = { "PDF"          : "ExponentialPlusConstant",
-                                                            #  "Title"        : "Combinatorial",
-                                                            #  "cB"           : {"par": [-1.72409e-03, -15.0e-03, -1.0e-03],
-                                                            #                    "title" : r"c^{\pi}_{\rm comb}"},
-                                                            #  "fracExpo"     : {"par": [7.0e-01 ,0.3,1.0],
-                                                            #                    "title" : r"f^{\pi}_{\rm comb}"}}
-    configdict["pdfList"]["Comb"]["Bd2DPi"]["BeautyMass"] = { "PDF"          : "DoubleExponential",
-                                                              "Title"        : "Combinatorial",
-                                                              "cB1"          : {"par": [-1.72409e-03, -15.0e-03, -1.0e-03],
-                                                                                "title" : r"c1^{\pi}_{\rm comb}"},
-                                                              "cB2"          : {"par": [-1.72409e-03, -15.0e-03, -1.0e-03],
-                                                                                "title" : r"c2^{\pi}_{\rm comb}"},
-                                                              "frac"         : {"par": [7.0e-01,0.01,1.0],
-                                                                                "title" : r"f^{\pi}_{\rm comb}"}}
-    
-    configdict["pdfList"]["Comb"]["Bd2DK"] = {}
-    configdict["pdfList"]["Comb"]["Bd2DK"]["BeautyMass"] = { "PDF"          : "Exponential",
-                                                             "Title"        : "Combinatorial",
-                                                             "cB"           : {"par": [-6.56407e-03, -15.0e-03, -2.0e-03],
-                                                                               "title" : r"c^{K}_{\rm comb}"}}
-    #configdict["pdfList"]["Comb"]["Bd2DK"]["BeautyMass"] = { "PDF"          : "ExponentialPlusConstant",
-    #                                                         "Title"        : "Combinatorial",
-    #                                                         "cB"           : {"par": [-6.56407e-03, -8.0e-03, -2.0e-03],
-    #                                                                           "title" : r"c^{K}_{\rm comb}"},
-    #                                                         "fracExpo"     : {"par": [5.42995e-01,0.0,1.0],
-    #                                                                           "title" : r"f^{K}_{\rm comb}"}}
-    #configdict["pdfList"]["Comb"]["Bd2DK"]["BeautyMass"] = { "PDF"          : "DoubleExponential",
-    #                                                         "Title"        : "Combinatorial",
-    #                                                         "cB1"          : {"par": [-1.72409e-03, -15.0e-03, -1.0e-03],
-    #                                                                           "title" : r"c1^{K}_{\rm comb}"},
-    #                                                         "cB2"          : {"par": [-1.72409e-03, -15.0e-03, -1.0e-03],
-    #                                                                           "title" : r"c2^{K}_{\rm comb}"},
-    #                                                         "frac"         : {"par": [7.0e-01 ,0.01,1.0],
-    #                                                                           "title" : r"f^{\pi}_{\rm comb}"}}
-
-    #Axes titles
-    configdict["AxisTitle"] = {"BeautyMass": {"Bd2DPi":"D#pi mass [MeV/c^{2}]",
-                                              "Bd2DK":"DK mass [MeV/c^{2}]"}}
-
-    #Range
-    configdict["Range"] = {"BeautyMass": {"Range": [configdict["BasicVariables"]["BeautyMass"]["Range"][0],
-                                                    configdict["BasicVariables"]["BeautyMass"]["Range"][1]],
-                                          "Bins": 227}}#455}}
-
-    #Range and sample for sWeights
-    configdict["sWeights"] = {"Hypo" : "Bd2DPi",
-                              #"Range" : {"BeautyMass" : [5090.0, 6000.0] },
-                              "Range" : {"BeautyMass" : [5220.0, 5600.0] },
-                              "Bins"  : 190
-                              }
-
-    #Log scale
-    configdict["LogScale"] = {"BeautyMass": {"Bd2DPi" : [1e-03, 1e+05], "Bd2DK" : [1e-01, 1e+04] } }
-
-    #Some coordinates
-    configdict["Legend"] = {"Xmin" : 0.6,
-                            "Ymin" : 0.2,
-                            "Xmax" : 0.89,
-                            "Ymax" : 0.6}
-    configdict["LHCbText"] = {"X"    : 0.89,
-                              "Y"    : 0.8,
-                              "Text" : "LHCb"}
-    configdict["Chi2"] = {"X"    : 0.6,
-                          "Y"    : 0.7}
-
-    #Yields
-    configdict["Yields"] = {"Signal"   : {"Bd2DPi"  : "nSig_"+samplemodeyear+"_Bd2DPiHypo_Evts",
-                                          "Bd2DK": "nSig_"+samplemodeyear+"_Bd2DKHypo_Evts"},
-                            "Bd2DK"    : {"Bd2DPi"  :
-                                          "nBd2DK_"+samplemodeyear+"_Bd2DPiHypo_Evts",
-                                          "Bd2DK": "nBd2DK_"+samplemodeyear+"_Bd2DKHypo_Evts"},
-                            "Bd2DRho"  : {"Bd2DPi"  : {"par": [9.1417e+04,0,500000],
-                                                       "title" : r"N^{\pi}_{\Bz\to D\rho}"},
-                                          "Bd2DK": "nBd2DRho_"+samplemodeyear+"_Bd2DKHypo_Evts"},
-                            "Bd2DstPi" : {"Bd2DPi"  : {"par": [6.2575e+04,0,500000],
-                                                       "title" : r"N^{\pi}_{\Bz\to \Dst\pi}"},
-                                          "Bd2DK": {"par": [0],
-                                                    "title" : "N^{K}_{\Bz\to \Dst\pi}"}},
-                            "Bs2DsPi"  : {"Bd2DPi"  : {"par": [0],
-                                                       "title" : r"N^{\pi}_{B_{s}\to D_{s}\pi}"},
-                                          "Bd2DK": {"par": [0],
-                                                    "title" : r"N^{K}_{B_{s}\to D_{s}\pi}"}},
-                            "Bd2DKst"  : {"Bd2DPi"  : {"par": [0],
-                                                       "title" : r"N^{\pi}_{\Bz\to D\Kst}"},
-                                          "Bd2DK": "nBd2DKst_"+samplemodeyear+"_Bd2DKHypo_Evts"},
-                            "Comb"     : {"Bd2DPi"  : {"par": [30000,0,500000],
-                                                       "title" : r"N^{\pi}_{\rm comb}"},
-                                          "Bd2DK": {"par": [2000,0,100000],
-                                                    "title" : r"N^{K}_{\rm comb}"}
-                                          }
-                            }
-
-    #Gaussian constraints
-    configdict["GaussianConstraints"] = {}
-    configdict["GaussianConstraints"]["Eff_Bd2DPi_DPi"] = {"Parameters" : ["eff_Bd2DPi_DPi"],
-                                                           "Mean"       : [configdict["GlobalVariables"]["eff_Bd2DPi_DPi"]["Range"][0]],
-                                                           "Covariance" : [configdict["GlobalVariables"]["eff_Bd2DPi_DPi"]["Error"]]}
-    configdict["GaussianConstraints"]["Eff_Bd2DK_DK"] = {"Parameters" : ["eff_Bd2DK_DK"],
-                                                         "Mean"       : [configdict["GlobalVariables"]["eff_Bd2DK_DK"]["Range"][0]],
-                                                         "Covariance" : [configdict["GlobalVariables"]["eff_Bd2DK_DK"]["Error"]]}
-    #configdict["GaussianConstraints"]["nDRho_to_DKst_KHypo"] = {"Parameters" : ["DRho_to_DKst_KHypo"],
-    #                                                          "Mean"       : [configdict["GlobalVariables"]["DRho_to_DKst_KHypo"]["Range"][0]],
-    #                                                          "Covariance" : [configdict["GlobalVariables"]["DRho_to_DKst_KHypo"]["Error"]]}
-    
-    #Plot of the fit to compute sWeights
-    configdict["sWeightsFitPlot"] = {}
-    configdict["sWeightsFitPlot"]["Total"] = {"Color" : kBlue,
-                                              "Style" : kSolid,
-                                              "Title" : "Total"}
-    configdict["sWeightsFitPlot"]["Signal"] = {"Color" : kRed,
-                                               "Style" : kDashed,
-                                               "Title" : "Signal"}
-    configdict["sWeightsFitPlot"]["Background"] = {"Color" : kBlack,
-                                                   "Style" : kDotted,
-                                                   "Title" : "Background"}
-    
-    #sWeight plot
-    configdict["plotsWeights"] = {"BeautyTime" : "#tau(B_{d}#rightarrow D#pi) (ps)",
-                                  "CharmMass"  : "K#pi#pi mass (MeV/c^{2})",
-                                  "BacPIDK"    : "PIDK"
-                                  }
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMDFitter_Bd_lowStat.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMDFitter_Bd_lowStat.py
deleted file mode 100644
index cc03a165052d92d87fa6b98a2a7a64067ff088ea..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMDFitter_Bd_lowStat.py
+++ /dev/null
@@ -1,587 +0,0 @@
-from ROOT import *
-
-def getconfig( samplemodeyear ) :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    import ROOT
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5090,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersConst_M_flat"}
-
-    configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1904    ],
-                                                      "Name"                   : "CharmMass",
-                                                      "InputName"              : "lab0_FitwithoutConst_Dplus_M_flat"}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.4,     12.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_ctau_flat"}
-    
-    configdict["BasicVariables"]["BacP"]          = { "Range"                  : [2000.0,  650000.0],
-                                                      "Name"                   : "BacP",
-                                                      "InputName"              : "lab0_FitDaughtersConst_P0_P_flat"}
-
-    configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-                                                      "Name"                   : "BacPT",
-                                                      "InputName"              : "lab0_FitDaughtersConst_P0_PT_flat"}
-
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0, 999.0     ],
-                                                      "Name"                   : "BacPIDK",
-                                                      "InputName"              : "lab1_PIDK"}
-
-    configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-                                                      "Name"                   : "nTracks",
-                                                      "InputName"              : "nTracks"}
-    
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_ID"}
-    
-    configdict["BasicVariables"]["TagDecOSComb"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                          "Name"                   : "TagDecOSComb",
-                                                          "InputName"              : "obsTagOS"}
-
-    configdict["BasicVariables"]["TagDecOSCharm"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                           "Name"                   : "TagDecOSCharm",
-                                                           "InputName"              : "obsTagOSCharm"}
-
-    configdict["BasicVariables"]["TagDecSSPionBDTRaw"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                                "Name"                   : "TagDecSSPionBDT",
-                                                                "InputName"              : "lab0_SS_nnetKaon_DEC"}
-
-    configdict["BasicVariables"]["TagDecSSProtonRaw"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                               "Name"                   : "TagDecSSProton",
-                                                               "InputName"              : "lab0_OS_nnetKaon_DEC"}
-
-    configdict["BasicVariables"]["MistagOSComb"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                          "Name"                   : "MistagOSComb",
-                                                          "InputName"              : "obsEtaOS"}
-
-    configdict["BasicVariables"]["MistagOSCharm"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                           "Name"                   : "MistagOSCharm",
-                                                           "InputName"              : "obsEtaOSCharm"}
-
-    configdict["BasicVariables"]["MistagSSPionBDTRaw"]      = { "Range"                  : [ -1.0,    1.0     ],
-                                                                "Name"                   : "MistagSSPionBDTRaw",
-                                                                "InputName"              : "lab0_SS_nnetKaon_PROB"}
-
-    configdict["BasicVariables"]["MistagSSProtonRaw"]      = { "Range"                  : [ -1.0,    1.0     ],
-                                                               "Name"                   : "MistagSSProtonRaw",
-                                                               "InputName"              : "lab0_OS_nnetKaon_PROB"}
-
-    configdict["BasicVariables"]["BDTG"]           = { "Range"                  : [0.0, 1],
-                                                       "Name"                   : "BDTG",
-                                                       "InputName"              : "BDT_classifier"}
-
-    #Additional variables not foreseen before
-    configdict["AdditionalVariables"] = {}
-    
-    configdict["AdditionalVariables"]["BeautyPhi"]      = { "Range"                  : [ -10.,    10.     ],
-                                                            "Name"                   : "BeautyPhi",
-                                                            "InputName"              : "lab0_LOKI_PHI"}
-    
-    configdict["AdditionalVariables"]["BeautyEta"]      = { "Range"                  : [ 1.5,    10.0     ],
-                                                            "Name"                   : "BeautyEta",
-                                                            "InputName"              : "lab0_LOKI_ETA"}
-    
-    configdict["AdditionalVariables"]["BeautyPT"]      = { "Range"                  : [ 0.0,    100000     ],
-                                                           "Name"                   : "BeautyPT",
-                                                           "InputName"              : "lab0_PT"}
-
-    configdict["AdditionalVariables"]["BeautyP"]      = { "Range"                  : [ 0.0,    3000000     ],
-                                                          "Name"                   : "BeautyP",
-                                                          "InputName"              : "lab0_P"}
-
-    configdict["AdditionalVariables"]["CharmTime"]    = { "Range"                  : [-10,     10    ],
-                                                          "Name"                   : "CharmTime",
-                                                          "InputName"              : "lab2_TAU"}
-    
-    configdict["AdditionalVariables"]["nPV"]      = { "Range"                  : [ 0.0,    10     ],
-                                                      "Name"                   : "nPV",
-                                                      "InputName"              : "nPV"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo2BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo2BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo2BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo3BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo3BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo3BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo4BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo4BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo4BodyBBDTDecision_TOS"}
-
-    #Useful constants
-    Pipeak = 5.2803e+03
-    Kpeak = 5.2798e+03
-
-    #Global variables (shared by different PDFs)
-    configdict["GlobalVariables"] = {}
-    configdict["GlobalVariables"]["eff_Bd2DPi_DPi"] = {}
-    configdict["GlobalVariables"]["eff_Bd2DPi_DPi"] = {"Type": "RooRealVar",
-                                                       "Title": r"\epsilon_{\rm PID}(\Bz\to D\pi)_{\pi}",
-                                                       "Range": [0.979, 0.8, 1.0],
-                                                       "Error": 0.004
-                                                       }
-    configdict["GlobalVariables"]["eff_Bd2DK_DK"] = {}
-    configdict["GlobalVariables"]["eff_Bd2DK_DK"] = {"Type": "RooRealVar",
-                                                     "Title": r"\epsilon_{\rm PID}(\Bz\to DK)_{K}",
-                                                     "Range": [0.637, 0.5, 0.8],
-                                                     "Error": 0.007
-                                                     }
-    configdict["GlobalVariables"]["Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo"] = {}
-    configdict["GlobalVariables"]["Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                             "Title": r"\mu^{\pi}_{\Bz\to D\pi}",
-                                                                                             "Range": [Pipeak, 5.2e+03, 5.35e+03]
-                                                                                             }
-    configdict["GlobalVariables"]["Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DKHypo"] = {}
-    configdict["GlobalVariables"]["Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DKHypo"] = {"Type": "RooRealVar",
-                                                                                            "Title": r"\mu^{K}_{\Bz\to D\pi}",
-                                                                                            "Range": [Kpeak, 5.2e+03, 5.35e+03]
-                                                                                            }
-    configdict["GlobalVariables"]["nSig_"+samplemodeyear+"_Bd2DPiHypo_Evts"] = {"Type": "RooRealVar",
-                                                                                "Title": r"N^{\pi}_{\Bz\to D\pi}",
-                                                                                "Range": [200000,0,900000]
-                                                                                }
-    configdict["GlobalVariables"]["nSig_"+samplemodeyear+"_Bd2DKHypo_Evts"] = {"Type": "RooFormulaVar",
-                                                                               "Title": r"N^{K}_{\Bz\to D\pi}",
-                                                                               "Formula": "((1-@0)/@0)*@1",
-                                                                               "Dependents": ["eff_Bd2DPi_DPi", "nSig_"+samplemodeyear+"_Bd2DPiHypo_Evts"]
-                                                                               }
-    configdict["GlobalVariables"]["nBd2DK_"+samplemodeyear+"_Bd2DKHypo_Evts"] = {"Type": "RooRealVar",
-                                                                                 "Title": r"N^{K}_{\Bz\to DK}",
-                                                                                 "Range": [15000,0,500000]
-                                                                                 }
-    configdict["GlobalVariables"]["nBd2DK_"+samplemodeyear+"_Bd2DPiHypo_Evts"] = {"Type": "RooFormulaVar",
-                                                                                  "Title": r"N^{\pi}_{\Bz\to DK}",
-                                                                                  "Formula": "((1-@0)/@0)*@1",
-                                                                                  "Dependents": ["eff_Bd2DK_DK", "nBd2DK_"+samplemodeyear+"_Bd2DKHypo_Evts"]
-                                                                                  }
-    configdict["GlobalVariables"]["nBd2DKst_"+samplemodeyear+"_Bd2DKHypo_Evts"] = {"Type": "RooRealVar",
-                                                                                   "Title": r"N^{K}_{\Bz\to D\Kst}",
-                                                                                   "Range": [2000, 0, 100000],
-                                                                                   }
-    #configdict["GlobalVariables"]["DRho_to_DK_KHypo"] = {"Type": "RooRealVar",
-    #                                                     "Title": "DRho_to_DK_KHypo",
-    #                                                     "Range": [0.20],
-    #                                                     "Error": 0.4
-    #                                                     }
-
-    configdict["GlobalVariables"]["DRho_to_DKst_KHypo"] = {"Type": "RooRealVar",
-                                                           "Title": "DRho_to_DKst_KHypo",
-                                                           "Range": [0.93],
-                                                           "Error": 0.23
-                                                         }
-    
-    configdict["GlobalVariables"]["nBd2DRho_"+samplemodeyear+"_Bd2DKHypo_Evts"] = {"Type": "RooFormulaVar",
-                                                                                   "Title": r"N^{K}_{\Bz\to D\rho}",
-                                                                                   #"Range": [5000, 0, 100000],
-                                                                                   "Formula": "@0*@1",
-                                                                                   "Dependents": ["nBd2DKst_"+samplemodeyear+"_Bd2DKHypo_Evts","DRho_to_DKst_KHypo"] 
-                                                                                   }
-
-    #configdict["GlobalVariables"]["DsPi_to_DPi_PiHypo"] = {"Type": "RooRealVar",
-    #                                                       "Title": "DsPi_to_DPi_PiHypo",
-    #                                                       "Range": [0.019],
-    #                                                       "Error": 0.013
-    #                                                       }
-    #configdict["GlobalVariables"]["nBs2DsPi_"+samplemodeyear+"_Bd2DPiHypo_Evts"] = {"Type": "RooFormulaVar",
-    #                                                                                "Title": "nBs2DsPi_"+samplemodeyear+"_Bd2DPiHypo_Evts",
-    #                                                                                "Formula": "@0*@1",
-    #                                                                                "Dependents": ["nSig_"+samplemodeyear+"_Bd2DPiHypo_Evts","DsPi_to_DPi_PiHypo"]
-    #                                                                                }
-    
-    configdict["GlobalVariables"]["Signal_IpatiaPlusJohnsonSU_BeautyMass_a1_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                           "Title": r"a1^{\pi}_{\Bz\to D\pi}",
-                                                                                                           "Range": [7.2205e-01],
-                                                                                                           }
-    configdict["GlobalVariables"]["Signal_IpatiaPlusJohnsonSU_BeautyMass_a2_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                           "Title": r"a2^{\pi}_{\Bz\to D\pi}",
-                                                                                                           "Range": [9.6101e-01],
-                                                                                                           }
-    configdict["GlobalVariables"]["Signal_IpatiaPlusJohnsonSU_BeautyMass_n1_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                           "Title": r"n1^{\pi}_{\Bz\to D\pi}",
-                                                                                                           "Range": [5.9199e+00],
-                                                                                                           }
-    configdict["GlobalVariables"]["Signal_IpatiaPlusJohnsonSU_BeautyMass_n2_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                           "Title": r"n2^{\pi}_{\Bz\to D\pi}",
-                                                                                                           "Range": [5.8254e+00],
-                                                                                                           }
-    configdict["GlobalVariables"]["Signal_IpatiaPlusJohnsonSU_BeautyMass_ascale_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                               "Title": r"sa^{\pi}_{\Bz\to D\pi}",
-                                                                                                               "Range": [1.0, 0.1, 10.0],
-                                                                                                               }
-    configdict["GlobalVariables"]["Signal_IpatiaPlusJohnsonSU_BeautyMass_nscale_"+samplemodeyear+"_Bd2DPiHypo"] = {"Type": "RooRealVar",
-                                                                                                               "Title": r"sn^{\pi}_{\Bz\to D\pi}",
-                                                                                                               "Range": [1.0, 0.1, 10.0],
-                                                                                                               }
-    configdict["GlobalVariables"]["Bd2DK_Ipatia_BeautyMass_a1_"+samplemodeyear+"_Bd2DKHypo"] = {"Type": "RooRealVar",
-                                                                                                "Title": r"a1^{K}_{\Bz\to DK}",
-                                                                                                "Range": [2.3381e+00],
-                                                                                                }
-    configdict["GlobalVariables"]["Bd2DK_Ipatia_BeautyMass_a2_"+samplemodeyear+"_Bd2DKHypo"] = {"Type": "RooRealVar",
-                                                                                                "Title": r"a2^{K}_{\Bz\to DK}",
-                                                                                                "Range": [1.0e+09],
-                                                                                                 }
-    configdict["GlobalVariables"]["Bd2DK_Ipatia_BeautyMass_n1_"+samplemodeyear+"_Bd2DKHypo"] = {"Type": "RooRealVar",
-                                                                                                "Title": r"n1^{K}_{\Bz\to DK}",
-                                                                                                "Range": [1.5601e+00],
-                                                                                                }
-    configdict["GlobalVariables"]["Bd2DK_Ipatia_BeautyMass_n2_"+samplemodeyear+"_Bd2DKHypo"] = {"Type": "RooRealVar",
-                                                                                                "Title": r"n2^{K}_{\Bz\to DK}",
-                                                                                                "Range": [0.0],
-                                                                                                }
-    #configdict["GlobalVariables"]["Bd2DK_Ipatia_BeautyMass_ascale_"+samplemodeyear+"_Bd2DKHypo"] = {"Type": "RooRealVar",
-    #                                                                                                "Title": r"sa^{K}_{\Bz\to DK}",
-    #                                                                                                "Range": [1.0, 0.1, 1.9],
-    #                                                                                                }
-    #configdict["GlobalVariables"]["Bd2DK_Ipatia_BeautyMass_nscale_"+samplemodeyear+"_Bd2DKHypo"] = {"Type": "RooRealVar",
-    #                                                                                                "Title": r"sn^{K}_{\Bz\to DK}",
-    #                                                                                                "Range": [1.0, 0.1, 1.9],
-    #                                                                                                }
-    
-    #PDF for each fitted component
-    #Structure: decay->hypo->observable
-    configdict["pdfList"] = {}
-    #
-    configdict["pdfList"]["Total"] = {}
-    configdict["pdfList"]["Total"]["Title"] = "Total"
-    configdict["pdfList"]["Total"]["Color"] = kBlue
-    configdict["pdfList"]["Total"]["Style"] = kSolid
-    #
-    configdict["pdfList"]["Signal"] = {}
-    configdict["pdfList"]["Signal"]["Title"] = "B_{d}#rightarrowD#pi"
-    configdict["pdfList"]["Signal"]["Color"] = kRed
-    configdict["pdfList"]["Signal"]["Style"] = kDashed
-    configdict["pdfList"]["Signal"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Signal"]["Bd2DPi"]["BeautyMass"] = { "PDF"        : "IpatiaPlusJohnsonSU",
-                                                                "shiftMean"  : False,
-                                                                "scaleTails" : True,
-                                                                "mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                "sigmaI"     : {"par": [4.3925e+01, 1.5e+01, 8.5e+01],
-                                                                                "title": r"\sigmaI^{\pi}_{\Bz\to D\pi}"},
-                                                                "sigmaJ"     : {"par": [1.6824e+01, 1.0e+01, 3.4e+01],
-                                                                                "title": r"\sigmaJ^{\pi}_{\Bz\to D\pi}"},
-                                                                "zeta"       : {"par": [0.0],
-                                                                                "title": r"\zeta^{\pi}_{\Bz\to D\pi}"},
-                                                                "fb"         : {"par": [0.0],
-                                                                                "title": r"\beta^{\pi}_{\Bz\to D\pi}"},
-                                                                "l"          : {"par": [-1.2397e+00],
-                                                                                "title" : "\lambda^{\pi}_{\Bz\to D\pi}"},
-                                                                "a1"         : "Signal_IpatiaPlusJohnsonSU_BeautyMass_a1_"+samplemodeyear+"_Bd2DPiHypo", #left
-                                                                "a2"         : "Signal_IpatiaPlusJohnsonSU_BeautyMass_a2_"+samplemodeyear+"_Bd2DPiHypo", #right
-                                                                "n1"         : "Signal_IpatiaPlusJohnsonSU_BeautyMass_n1_"+samplemodeyear+"_Bd2DPiHypo", #left
-                                                                "n2"         : "Signal_IpatiaPlusJohnsonSU_BeautyMass_n2_"+samplemodeyear+"_Bd2DPiHypo",#right,
-                                                                "nu"         : {"par": [-1.0506e-01],
-                                                                                "title": r"\nu^{\pi}_{\Bz\to D\pi}"},
-                                                                "tau"        : {"par": [3.2598e-01],
-                                                                                "title": r"\tau^{\pi}_{\Bz\to D\pi}"},
-                                                                "fracI"      : {"par": [4.3622e-01],
-                                                                                "title": r"f^{\pi}_{\Bz\to D\pi}"}}
-    
-    configdict["pdfList"]["Signal"]["Bd2DK"] = {}
-    configdict["pdfList"]["Signal"]["Bd2DK"]["BeautyMass"] = { "PDF"        : "Ipatia",
-                                                               "shiftMean"  : False,
-                                                               "scaleTails" : False,
-                                                               "mean"       : {"par": [5.3365e+03,5.25e+03,5.45e+03],
-                                                                               "title" : r"\mu^{K}_{\Bz\to D\pi}"},
-                                                               "sigma"      : {"par": [2.3972e+01],
-                                                                                "title" : r"\sigma^{K}_{\Bz\to D\pi}"},
-                                                               "zeta"       : {"par": [0.0],
-                                                                                "title" : r"\zeta^{K}_{\Bz\to D\pi}"},
-                                                               "fb"         : {"par": [0.0],
-                                                                                "title" : r"\beta^{K}_{\Bz\to D\pi}"},
-                                                               "l"          : {"par": [-3.7704e+00],
-                                                                                "title" : r"\lambda^{K}_{\Bz\to D\pi}"},
-                                                               "a1"         : {"par": [3.1436e+00],
-                                                                                "title" : r"a11^{K}_{\Bz\to D\pi}"},
-                                                               "a2"         : {"par": [5.6856e-01],
-                                                                                "title" : r"a21^{K}_{\Bz\to D\pi}"},
-                                                               "n1"         : {"par": [4.7325e-02],
-                                                                                "title" : r"n11^{K}_{\Bz\to D\pi}"},
-                                                               "n2"         : {"par": [2.8096e+00],
-                                                                               "title": r"n21^{K}_{\Bz\to D\pi}"}}
-    #
-    configdict["pdfList"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DK"]["Title"] = "B_{d}#rightarrowDK"
-    configdict["pdfList"]["Bd2DK"]["Color"] = kBlack
-    configdict["pdfList"]["Bd2DK"]["Style"] = kDotted
-    configdict["pdfList"]["Bd2DK"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bd2DK"]["Bd2DPi"]["BeautyMass"] = { "PDF"        : "Ipatia",
-                                                               "shiftMean"  : False,
-                                                               "scaleTails" : False,
-                                                               "mean"       : {"par": [5.2400e+03,5.15e+03,5.35e+03],
-                                                                               "title" : r"\mu^{\pi}_{\Bz\to DK}"},
-                                                               "sigma"      : {"par": [2.3434e+01],
-                                                                               "title" : r"\sigma^{\pi}_{\Bz\to DK}"},
-                                                               "zeta"       : {"par": [0.0],
-                                                                               "title" : r"\zeta^{\pi}_{\Bz\to DK}"},
-                                                               "fb"         : {"par": [0.0],
-                                                                               "title" : r"\beta^{\pi}_{\Bz\to DK}"},
-                                                               "l"          : {"par": [-2.3916e+01],
-                                                                               "title" : r"\lambda^{\pi}_{\Bz\to DK}"},
-                                                               "a1"         : {"par": [8.9842e-01],
-                                                                               "title" : r"a1^{\pi}_{\Bz\to DK}"},
-                                                               "a2"         : {"par": [1.0920e+00],
-                                                                               "title" : r"a2^{\pi}_{\Bz\to DK}"},
-                                                               "n1"         : {"par": [3.8290e+00],
-                                                                               "title" : r"n1^{\pi}_{\Bz\to DK}"},
-                                                               "n2"         : {"par": [2.1980e+01],
-                                                                               "title" : r"n2^{\pi}_{\Bz\to DK}"}}
-    configdict["pdfList"]["Bd2DK"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DK"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "Ipatia",
-                                                             "shiftMean"  : False,
-                                                             "scaleTails" : False,
-                                                             "mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DKHypo",
-                                                             "sigma"      : {"par": [1.7320e+01, 0.5e+01, 6e+01],
-                                                                             "title": r"\sigma^{K}_{\Bz\to DK}"},
-                                                             "zeta"       : {"par": [0.0],
-                                                                             "title" : r"\zeta^{K}_{\Bz\to DK}"},
-                                                             "fb"         : {"par": [0.0],
-                                                                             "title" : r"\beta^{K}_{\Bz\to DK}"},
-                                                             "l"          : {"par": [-3.4455e+00],
-                                                                             "title" : r"\lambda^{K}_{\Bz\to DK}"},
-                                                             "a1"         : "Bd2DK_Ipatia_BeautyMass_a1_"+samplemodeyear+"_Bd2DKHypo",
-                                                             "a2"         : "Bd2DK_Ipatia_BeautyMass_a2_"+samplemodeyear+"_Bd2DKHypo",
-                                                             "n1"         : "Bd2DK_Ipatia_BeautyMass_n1_"+samplemodeyear+"_Bd2DKHypo",
-                                                             "n2"         : "Bd2DK_Ipatia_BeautyMass_n2_"+samplemodeyear+"_Bd2DKHypo"
-                                                             }
-    #
-    configdict["pdfList"]["Bd2DRho"] = {}
-    configdict["pdfList"]["Bd2DRho"]["Title"] = "B_{d}#rightarrowD#rho"
-    configdict["pdfList"]["Bd2DRho"]["Color"] = kMagenta
-    configdict["pdfList"]["Bd2DRho"]["Style"] = kDotted
-    configdict["pdfList"]["Bd2DRho"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bd2DRho"]["Bd2DPi"]["BeautyMass"] = {"PDF"        : "JohnsonSU",
-                                                                "shiftMean" : True,
-                                                                "mean"      : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                "shift"     : {"par": [4.8278e+03-Pipeak],
-                                                                               "title" : r"\Delta\mu^{\pi}_{\Bz\to D\rho}"},
-                                                                "sigma"     : {"par": [5.4939e+02],
-                                                                               "title" : r"\sigma^{\pi}_{\Bz\to D\rho}"},
-                                                                "nu"        : {"par": [-2.0121e+00],
-                                                                               "title" : r"\nu^{\pi}_{\Bz\to D\rho}"},
-                                                                "tau"       : {"par": [1.1632e+00],
-                                                                               "title" : r"\tau^{\pi}_{\Bz\to D\rho}"}}
-    configdict["pdfList"]["Bd2DRho"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DRho"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "DoubleGaussian",
-                                                               "shiftMean"  : True,
-                                                               "sameMean"   : True,
-                                                               "mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DKHypo",
-                                                               "shift"      : {"par": [5.1094e+03-Kpeak],
-                                                                               "title" : r"\Delta\mu^{K}_{\Bz\to D\rho}"},
-                                                               #"mean"      : {"par": [5.1316e+03, 5000, 6000],
-                                                               #               "title" : r"\mu^{K}_{\Bz\to D\rho}"},
-                                                               "sigma1"     : {"par": [1.1656e+02],
-                                                                               "title" : r"\sigma 1\mu^{K}_{\Bz\to D\rho}"},
-                                                               "sigma2"     : {"par": [4.4513e+01],
-                                                                               "title" : r"\sigma 2^{K}_{\Bz\to D\rho}"},
-                                                               "frac"       : {"par": [2.1017e-01],
-                                                                               "title" : r"f^{K}_{\Bz\to D\rho}"}}
-    #
-    configdict["pdfList"]["Bd2DstPi"] = {}
-    configdict["pdfList"]["Bd2DstPi"]["Title"] = "B_{d}#rightarrowD^{*}#pi"
-    configdict["pdfList"]["Bd2DstPi"]["Color"] = kGreen
-    configdict["pdfList"]["Bd2DstPi"]["Style"] = kDotted
-    configdict["pdfList"]["Bd2DstPi"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bd2DstPi"]["Bd2DPi"]["BeautyMass"] = {"PDF"         : "CrystalBallPlusGaussian",
-                                                                 "shiftMean"   : True,
-                                                                 "scaleWidths" : False,
-                                                                 "mean"        : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                 "shift"       : {"par": [5.1009e+03-Pipeak],
-                                                                                  "title" : r"\Delta\mu^{\pi}_{\Bz\to \Dst\pi}"},
-                                                                 "alpha"       : {"par": [-1.4432e+00],
-                                                                                  "title" : r"\alpha^{\pi}_{\Bz\to \Dst\pi}"},
-                                                                 "n"           : {"par": [4.6477e+00],
-                                                                                  "title" : r"n^{\pi}_{\Bz\to \Dst\pi}"},
-                                                                 "sigmaCB"     : {"par": [2.5844e+01],
-                                                                                  "title" : r"\sigma CB^{\pi}_{\Bz\to \Dst\pi}"},
-                                                                 "sigmaG"      : {"par": [1.6520e+01],
-                                                                                  "title" : r"\sigma G^{\pi}_{\Bz\to \Dst\pi}"},
-                                                                 "fracG"       : {"par": [3.0218e-01],
-                                                                                  "title" : r"f^{\pi}_{\Bz\to \Dst\pi}"}}
-    configdict["pdfList"]["Bd2DstPi"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DstPi"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "None"}
-    #
-    configdict["pdfList"]["Bs2DsPi"] = {}
-    configdict["pdfList"]["Bs2DsPi"]["Title"] = "B_{s}#rightarrowD_{s}#pi"
-    configdict["pdfList"]["Bs2DsPi"]["Color"] = kCyan
-    configdict["pdfList"]["Bs2DsPi"]["Style"] = kDotted
-    configdict["pdfList"]["Bs2DsPi"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bs2DsPi"]["Bd2DPi"]["BeautyMass"] = {"PDF"        : "None"}#{"PDF"        : "Ipatia",
-                                                                #"shiftMean"  : True,
-                                                                #"scaleTails" : False,
-                                                                #"mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DPiHypo",
-                                                                #"shift"      : {"par": [5312.13-Pipeak],
-                                                                #                "title": r"\Delta\mu^{\pi}_{B_{s}\to D_{s}\pi}"},
-                                                                #"sigma"      : {"par": [25.6861],
-                                                                #                "title": r"\sigma^{\pi}_{B_{s}\to D_{s}\pi}"},
-                                                                #"zeta"       : {"par": [0.0],
-                                                                #                "title": r"\zeta\mu^{\pi}_{B_{s}\to D_{s}\pi}"},
-                                                                #"fb"         : {"par": [0.0],
-                                                                #                "title": r"\beta^{\pi}_{B_{s}\to D_{s}\pi}"},
-                                                                #"l"          : {"par": [-9.99936],
-                                                                #                "title": r"l^{\pi}_{B_{s}\to D_{s}\pi}"},
-                                                                #"a1"         : {"par": [0.888263],
-                                                                #                "title": r"a1^{\pi}_{B_{s}\to D_{s}\pi}"},
-                                                                #"a2"         : {"par": [3.03441],
-                                                                #                "title": r"a2^{\pi}_{B_{s}\to D_{s}\pi}"},
-                                                                #"n1"         : {"par": [5.26049],
-                                                                #                "title": r"n1^{\pi}_{B_{s}\to D_{s}\pi}"},
-                                                                #"n2"         : {"par": [1.22319],
-                                                                #                "title": r"n2^{\pi}_{B_{s}\to D_{s}\pi}"}}
-    
-    configdict["pdfList"]["Bs2DsPi"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bs2DsPi"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "None"}
-    #
-    configdict["pdfList"]["Bd2DKst"] = {}
-    configdict["pdfList"]["Bd2DKst"]["Title"] = "B_{d}#rightarrowD^{(*)}K^{(*)}/#pi"
-    configdict["pdfList"]["Bd2DKst"]["Color"] = kGreen
-    configdict["pdfList"]["Bd2DKst"]["Style"] = kDotted
-    configdict["pdfList"]["Bd2DKst"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bd2DKst"]["Bd2DPi"]["BeautyMass"] = {"PDF"       : "None"} 
-    configdict["pdfList"]["Bd2DKst"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DKst"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "Gaussian",
-                                                               "shiftMean"  : False,#True,
-                                                               #"mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bd2DKHypo",
-                                                               #"shift"       : {"par": [5.1077e+03-Kpeak],
-                                                               #                 "title" : r"\Delta\mu^{K}_{\Bz\to D\Kst}"},
-                                                               "mean"       : {"par": [5.1077e+03, 4.8e+03, 5.5e+03],
-                                                                               "title" : r"\mu^{K}_{\Bz\to D\Kst}"},
-                                                               "sigma"      : {"par": [2.8878e+01, 1e+01, 6e+01],
-                                                                                "title" : r"\sigma^{K}_{\Bz\to D\Kst}"}}
-    #
-    configdict["pdfList"]["Comb"] = {}
-    configdict["pdfList"]["Comb"]["Title"] = "Combinatorial"
-    configdict["pdfList"]["Comb"]["Color"] = kBlue
-    configdict["pdfList"]["Comb"]["Style"] = kDotted
-    configdict["pdfList"]["Comb"]["Bd2DPi"] = {}
-    #configdict["pdfList"]["Comb"]["Bd2DPi"]["BeautyMass"] = { "PDF"          : "ExponentialPlusConstant",
-                                                            #  "Title"        : "Combinatorial",
-                                                            #  "cB"           : {"par": [-1.72409e-03, -15.0e-03, -1.0e-03],
-                                                            #                    "title" : r"c^{\pi}_{\rm comb}"},
-                                                            #  "fracExpo"     : {"par": [7.0e-01 ,0.3,1.0],
-                                                            #                    "title" : r"f^{\pi}_{\rm comb}"}}
-    configdict["pdfList"]["Comb"]["Bd2DPi"]["BeautyMass"] = { "PDF"          : "DoubleExponential",
-                                                              "Title"        : "Combinatorial",
-                                                              "cB1"          : {"par": [-1.72409e-03, -15.0e-03, -1.0e-03],
-                                                                                "title" : r"c1^{\pi}_{\rm comb}"},
-                                                              "cB2"          : {"par": [-1.72409e-03, -15.0e-03, -1.0e-03],
-                                                                                "title" : r"c2^{\pi}_{\rm comb}"},
-                                                              "frac"         : {"par": [7.0e-01,0.01,1.0],
-                                                                                "title" : r"f^{\pi}_{\rm comb}"}}
-    
-    configdict["pdfList"]["Comb"]["Bd2DK"] = {}
-    configdict["pdfList"]["Comb"]["Bd2DK"]["BeautyMass"] = { "PDF"          : "Exponential",
-                                                             "Title"        : "Combinatorial",
-                                                             "cB"           : {"par": [-6.56407e-03, -15.0e-03, -2.0e-03],
-                                                                               "title" : r"c^{K}_{\rm comb}"}}
-    #configdict["pdfList"]["Comb"]["Bd2DK"]["BeautyMass"] = { "PDF"          : "ExponentialPlusConstant",
-    #                                                         "Title"        : "Combinatorial",
-    #                                                         "cB"           : {"par": [-6.56407e-03, -8.0e-03, -2.0e-03],
-    #                                                                           "title" : r"c^{K}_{\rm comb}"},
-    #                                                         "fracExpo"     : {"par": [5.42995e-01,0.0,1.0],
-    #                                                                           "title" : r"f^{K}_{\rm comb}"}}
-    #configdict["pdfList"]["Comb"]["Bd2DK"]["BeautyMass"] = { "PDF"          : "DoubleExponential",
-    #                                                         "Title"        : "Combinatorial",
-    #                                                         "cB1"          : {"par": [-1.72409e-03, -15.0e-03, -1.0e-03],
-    #                                                                           "title" : r"c1^{K}_{\rm comb}"},
-    #                                                         "cB2"          : {"par": [-1.72409e-03, -15.0e-03, -1.0e-03],
-    #                                                                           "title" : r"c2^{K}_{\rm comb}"},
-    #                                                         "frac"         : {"par": [7.0e-01 ,0.01,1.0],
-    #                                                                           "title" : r"f^{\pi}_{\rm comb}"}}
-
-    #Axes titles
-    configdict["AxisTitle"] = {"BeautyMass": {"Bd2DPi":"D#pi mass [MeV/c^{2}]",
-                                              "Bd2DK":"DK mass [MeV/c^{2}]"}}
-
-    #Range
-    configdict["Range"] = {"BeautyMass": {"Range": [configdict["BasicVariables"]["BeautyMass"]["Range"][0],
-                                                    configdict["BasicVariables"]["BeautyMass"]["Range"][1]],
-                                          "Bins": 227}}#455}}
-
-    #Range and sample for sWeights
-    configdict["sWeights"] = {"Hypo" : "Bd2DPi",
-                              "Range" : {"BeautyMass" : [5220.0, 5600.0] },
-                              "Bins"  : 190
-                              }
-
-    #Log scale
-    configdict["LogScale"] = {"BeautyMass": {"Bd2DPi" : [1e-03, 1e+05], "Bd2DK" : [1e-01, 1e+04] } }
-
-    #Some coordinates
-    configdict["Legend"] = {"Xmin" : 0.6,
-                            "Ymin" : 0.2,
-                            "Xmax" : 0.89,
-                            "Ymax" : 0.6}
-    configdict["LHCbText"] = {"X"    : 0.89,
-                              "Y"    : 0.8,
-                              "Text" : "LHCb"}
-    configdict["Chi2"] = {"X"    : 0.6,
-                          "Y"    : 0.7}
-
-    #Yields
-    configdict["Yields"] = {"Signal"   : {"Bd2DPi"  : "nSig_"+samplemodeyear+"_Bd2DPiHypo_Evts",
-                                          "Bd2DK": "nSig_"+samplemodeyear+"_Bd2DKHypo_Evts"},
-                            "Bd2DK"    : {"Bd2DPi"  :
-                                          "nBd2DK_"+samplemodeyear+"_Bd2DPiHypo_Evts",
-                                          "Bd2DK": "nBd2DK_"+samplemodeyear+"_Bd2DKHypo_Evts"},
-                            "Bd2DRho"  : {"Bd2DPi"  : {"par": [4.1417e+04,0,500000],
-                                                       "title" : r"N^{\pi}_{\Bz\to D\rho}"},
-                                          "Bd2DK": "nBd2DRho_"+samplemodeyear+"_Bd2DKHypo_Evts"},
-                            "Bd2DstPi" : {"Bd2DPi"  : {"par": [3.2575e+04,0,500000],
-                                                       "title" : r"N^{\pi}_{\Bz\to \Dst\pi}"},
-                                          "Bd2DK": {"par": [0],
-                                                    "title" : "N^{K}_{\Bz\to \Dst\pi}"}},
-                            "Bs2DsPi"  : {"Bd2DPi"  : {"par": [0],
-                                                       "title" : r"N^{\pi}_{B_{s}\to D_{s}\pi}"},
-                                          "Bd2DK": {"par": [0],
-                                                    "title" : r"N^{K}_{B_{s}\to D_{s}\pi}"}},
-                            "Bd2DKst"  : {"Bd2DPi"  : {"par": [0],
-                                                       "title" : r"N^{\pi}_{\Bz\to D\Kst}"},
-                                          "Bd2DK": "nBd2DKst_"+samplemodeyear+"_Bd2DKHypo_Evts"},
-                            "Comb"     : {"Bd2DPi"  : {"par": [15000,0,500000],
-                                                       "title" : r"N^{\pi}_{\rm comb}"},
-                                          "Bd2DK": {"par": [1000,0,100000],
-                                                    "title" : r"N^{K}_{\rm comb}"}
-                                          }
-                            }
-
-    #Gaussian constraints
-    configdict["GaussianConstraints"] = {}
-    configdict["GaussianConstraints"]["Eff_Bd2DPi_DPi"] = {"Parameters" : ["eff_Bd2DPi_DPi"],
-                                                           "Mean"       : [configdict["GlobalVariables"]["eff_Bd2DPi_DPi"]["Range"][0]],
-                                                           "Covariance" : [configdict["GlobalVariables"]["eff_Bd2DPi_DPi"]["Error"]]}
-    configdict["GaussianConstraints"]["Eff_Bd2DK_DK"] = {"Parameters" : ["eff_Bd2DK_DK"],
-                                                         "Mean"       : [configdict["GlobalVariables"]["eff_Bd2DK_DK"]["Range"][0]],
-                                                         "Covariance" : [configdict["GlobalVariables"]["eff_Bd2DK_DK"]["Error"]]}
-    #configdict["GaussianConstraints"]["nDRho_to_DKst_KHypo"] = {"Parameters" : ["DRho_to_DKst_KHypo"],
-    #                                                          "Mean"       : [configdict["GlobalVariables"]["DRho_to_DKst_KHypo"]["Range"][0]],
-    #                                                          "Covariance" : [configdict["GlobalVariables"]["DRho_to_DKst_KHypo"]["Error"]]}
-    
-    #Plot of the fit to compute sWeights
-    configdict["sWeightsFitPlot"] = {}
-    configdict["sWeightsFitPlot"]["Total"] = {"Color" : kBlue,
-                                              "Style" : kSolid,
-                                              "Title" : "Total"}
-    configdict["sWeightsFitPlot"]["Signal"] = {"Color" : kRed,
-                                               "Style" : kDashed,
-                                               "Title" : "Signal"}
-    configdict["sWeightsFitPlot"]["Background"] = {"Color" : kBlack,
-                                                   "Style" : kDotted,
-                                                   "Title" : "Background"}
-    
-    #sWeight plot
-    configdict["plotsWeights"] = {"BeautyTime" : "#tau(B_{d}#rightarrow D#pi) (ps)",
-                                  "CharmMass"  : "K#pi#pi mass (MeV/c^{2})"
-                                  }
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMassFit.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMassFit.py
deleted file mode 100644
index 3b63bbea40223558c52077f5d9da4231ff3df425..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForMassFit.py
+++ /dev/null
@@ -1,304 +0,0 @@
-from ROOT import *
-
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    import ROOT
-    from ROOT import *
-
-    happystar = "#lower[-0.65]{#scale[0.6]{*}}"
-
-    configdict["Decay"] = "Bd2DPi"
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5090,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersConst_M_flat"}
-
-    configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1904    ],
-                                                      "Name"                   : "CharmMass",
-                                                      "InputName"              : "lab0_FitwithoutConst_Dplus_M_flat"}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.2,     12.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_ctau_flat"}
-    
-    configdict["BasicVariables"]["BacP"]          = { "Range"                  : [2000.0,  650000.0],
-                                                      "Name"                   : "BacP",
-                                                      "InputName"              : "lab0_FitDaughtersConst_P0_P_flat"}
-
-    configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-                                                      "Name"                   : "BacPT",
-                                                      "InputName"              : "lab0_FitDaughtersConst_P0_PT_flat"}
-
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0, 999.0     ],
-                                                      "Name"                   : "BacPIDK",
-                                                      "InputName"              : "lab1_PIDKcorr"}
-
-    configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-                                                      "Name"                   : "nTracks",
-                                                      "InputName"              : "nTracks"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_ID"}
-
-    configdict["BasicVariables"]["BDTG"]           = { "Range"                  : [0.0, 1],
-                                                       "Name"                   : "BDTG",
-                                                       "InputName"              : "BDT_classifier"}
-    
-    
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts   
-    # order of particles: KPiPi 
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-    
-    configdict["constParams"] = []
-
-    #PDF for each fitted component
-    #Structure: decay->hypo->observable
-    configdict["pdfList"] = {}
-    #
-    configdict["pdfList"]["Signal"] = {}
-    configdict["pdfList"]["Signal"]["Bd2DPi"] = {}
-    #configdict["pdfList"]["Signal"]["Bd2DPi"]["BeautyMass"] = { "PDF"        : "Ipatia",
-    #                                                            "Title"      : "B_{d}#rightarrowD#pi",
-    #                                                            "Bins"       : 175,
-    #                                                            "Min"        : 5150.0,
-    #                                                            "Max"        : 5500.0,
-    #                                                            "Unit"       : "MeV/c^{2}",
-    #                                                            "mean"       : [5280,5200,5350],
-    #                                                            "sigma"      : [25.0,1.0,100.0],
-    #                                                            "zeta"       : [0.0],
-    #                                                            "fb"         : [0.0],
-    #                                                            "l"          : [-2.0,-5.0,-0.01],
-    #                                                            "a1"         : [3.0,0.01,6.0],
-    #                                                            "a2"         : [3.0,0.01,6.0],
-    #                                                            "n1"         : [3.0,0.01,6.0],
-    #                                                            "n2"         : [3.0,0.01,6.0]}
-    configdict["pdfList"]["Signal"]["Bd2DPi"]["BeautyMass"] = { "PDF"        : "IpatiaPlusJohnsonSU",
-                                                                "Title"      : "B_{d}#rightarrowD#pi",
-                                                                "Bins"       : 125,
-                                                                "Min"        : 5150.0,
-                                                                "Max"        : 5500.0,
-                                                                "Unit"       : "MeV/c^{2}",
-                                                                "mean"       : [5280,5200,5350],
-                                                                "sigmaI"     : [25.0, 1.0,100.0],
-                                                                "sigmaJ"     : [25.0, 1.0, 100.0],
-                                                                "zeta"       : [0.0],
-                                                                "fb"         : [0.0],
-                                                                "l"          : [-2.0,-5.0,0.0],
-                                                                "a1"         : [3.0,0.01,6.0],
-                                                                "a2"         : [3.0,0.01,6.0],
-                                                                "n1"         : [3.0,0.01,6.0],
-                                                                "n2"         : [3.0,0.01,6.0],
-                                                                "nu"         : [1.0,-30.0,30.0],
-                                                                "tau"        : [1.0,-30.0,30.0],
-                                                                "fracI"      : [0.7, 0.001, 0.999]}
-    
-    configdict["pdfList"]["Signal"]["Bd2DK"] = {}
-    configdict["pdfList"]["Signal"]["Bd2DK"]["BeautyMass"] = { "PDF"        : "Ipatia",
-                                                               "Title"      : "B_{d}#rightarrowD#pi",
-                                                               "Bins"       : 100,
-                                                               "Min"        : 5200.0,
-                                                               "Max"        : 5800.0,
-                                                               "Unit"       : "MeV/c^{2}",
-                                                               "mean"       : [5400,5200.0,5600.0],
-                                                               "sigma"      : [80.0,10.0,150.0],
-                                                               "zeta"       : [0.0],
-                                                               "fb"         : [0.0],
-                                                               "l"          : [-3.0,-10.0,-0.01],
-                                                               "a1"         : [3.0,0.01,10.0],
-                                                               "a2"         : [3.0,0.01,10.0],
-                                                               "n1"         : [3.0,0.01,10.0],
-                                                               "n2"         : [3.0,0.01,10.0]}
-    #
-    configdict["pdfList"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DK"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bd2DK"]["Bd2DPi"]["BeautyMass"] = { "PDF"        : "Ipatia",
-                                                               "Title"      : "B_{d}#rightarrowDK",
-                                                               "Bins"       : 82,
-                                                               "Min"        : 5090.0,
-                                                               "Max"        : 5500.0,
-                                                               "Unit"       : "MeV/c^{2}",
-                                                               "mean"       : [5239.0,5200.0,5250.0],
-                                                               "sigma"      : [26.3,1.0,50.0],
-                                                               "zeta"       : [0.0],
-                                                               "fb"         : [0.0],
-                                                               "l"          : [-28.0,-55.0,-15.0],
-                                                               "a1"         : [0.96,0.01,30.0],
-                                                               "a2"         : [1.23,0.01,30.0],
-                                                               "n1"         : [3.5,0.01,30.0],
-                                                               "n2"         : [10.0,0.01,30.0]}
-    configdict["pdfList"]["Bd2DK"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DK"]["Bd2DK"]["BeautyMass"] = { "PDF"        : "Ipatia",
-                                                              "Title"      : "B_{d}#rightarrowDK",
-                                                              "Bins"       : 80,
-                                                              "Min"        : 5100.0,#5200.0,
-                                                              "Max"        : 5500.0,#5380.0,
-                                                              "Unit"       : "MeV/c^{2}",
-                                                              "mean"       : [5280.0,5100.0,5500.0],
-                                                              "sigma"      : [17.0,5.0,50.0],
-                                                              "zeta"       : [0.0],
-                                                              "fb"         : [0.0],
-                                                              "l"          : [-3.6,-15.0,-0.01],
-                                                              "a1"         : [2.6,0.1,100.0],
-                                                              "a2"         : [1e+09],
-                                                              "n1"         : [0.95,0.001,55.0],
-                                                              "n2"         : [0.0]}
-    #
-    configdict["pdfList"]["Bd2DRho"] = {}
-    configdict["pdfList"]["Bd2DRho"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bd2DRho"]["Bd2DPi"]["BeautyMass"] = {"PDF"        : "JohnsonSU",
-                                                                "Title"      : "B_{d}#rightarrowD#rho",
-                                                                "Bins"       : 100,
-                                                                "Min"        : 5090.0,
-                                                                "Max"        : 5250.0,
-                                                                "Unit"       : "MeV/c^{2}",
-                                                                "mean"       : [4.89304e+03,4700.0,4910.0],
-                                                                "sigma"      : [600, 400.0, 1000.0],
-                                                                "nu"         : [-1.9084e+00, -2.8, -1.3],
-                                                                "tau"        : [1.3406e+00, 0.7, 1.8]}
-    configdict["pdfList"]["Bd2DRho"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DRho"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "DoubleGaussian",
-                                                               "Title"      : "B_{d}#rightarrowD#rho",
-                                                               "Bins"       : 30,
-                                                               "Min"        : 5090.0,
-                                                               "Max"        : 5450.0,
-                                                               "Unit"       : "MeV/c^{2}",
-                                                               "sameMean"   : False,
-                                                               "mean"       : [5100.0,5000.0,5500.0],
-                                                               "sigma1"     : [1.1754e+02, 50.0, 200.0],
-                                                               "sigma2"     : [2.73259e+02, 10.0, 400.0],
-                                                               "frac"       : [0.690345, 0.1, 0.99]}
-    #
-    configdict["pdfList"]["Bd2DstPi"] = {}
-    configdict["pdfList"]["Bd2DstPi"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bd2DstPi"]["Bd2DPi"]["BeautyMass"] = {"PDF"        : "CrystalBallPlusGaussian",
-                                                                 "Title"      : "B_{d}#rightarrowD"+happystar+"#pi",
-                                                                 "Bins"       : 100,
-                                                                 "Min"        : 5090.0,
-                                                                 "Max"        : 6000.0,
-                                                                 "Unit"       : "MeV/c^{2}",
-                                                                 "shiftMean"  : False,
-                                                                 "mean"       : [5100,5000.0,5200.0],
-                                                                 "alpha"      : [-2,-10.0,10.0],
-                                                                 "n"          : [1,0.0,10.0],
-                                                                 "sigmaCB"    : [25,1.0,100.0],
-                                                                 "sigmaG"     : [25,1.0,100.0],
-                                                                 "fracG"      : [0.5,0.1,0.9]}
-    configdict["pdfList"]["Bd2DstPi"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bd2DstPi"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "DoubleGaussian",
-                                                                "Title"      : "B_{d}#rightarrowD"+happystar+"#pi",
-                                                                "Bins"       : 100,#50,
-                                                                "Min"        : 5090.0,#5100.0,
-                                                                "Max"        : 5600.0,#5350.0,
-                                                                "Unit"       : "MeV/c^{2}",
-                                                                "sameMean"   : False,
-                                                                "mean"       : [5150,4900.0,5500.0],
-                                                                "sigma1"     : [26.59,1.0,100.0],
-                                                                "sigma2"     : [26.59,1.0,500.0], 
-                                                                "frac"       : [0.5,0.1,0.9]}
-    #
-    configdict["pdfList"]["Bd2DKst"] = {}
-    configdict["pdfList"]["Bd2DKst"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bd2DKst"]["Bd2DPi"]["BeautyMass"] = {"PDF"        : "Gaussian",
-                                                                "Title"      : "B_{d}#rightarrowDK"+happystar,
-                                                                "Bins"       : 50,#20,
-                                                                "Min"        : 5090.0,
-                                                                "Max"        : 5600.0,#5200.0,
-                                                                "Unit"       : "MeV/c^{2}",
-                                                                "shiftMean"  : False,
-                                                                "mean"       : [5100.92,4000.0,5200.0],
-                                                                "sigma"      : [26.59,1.0,100.0]}
-    configdict["pdfList"]["Bd2DKst"]["Bd2DK"] = {}
-    #configdict["pdfList"]["Bd2DKst"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "Gaussian",
-    #                                                           "Title"      : "B_{d}#rightarrowDK"+happystar,
-    #                                                           "Bins"       : 25,
-    #                                                           "Min"        : 5090.0,
-    #                                                           "Max"        : 5350.0,
-    #                                                           "Unit"       : "MeV/c^{2}",
-    #                                                           "shiftMean"  : False,
-    #                                                           "mean"       : [5150,4900.0,5500.0],
-    #                                                           "sigma"      : [26.59,1.0,100.0]}
-    
-    configdict["pdfList"]["Bd2DKst"]["Bd2DK"]["BeautyMass"] = {"PDF"        : "Gaussian",
-                                                               "Title"      : "B_{d}#rightarrowDK"+happystar,
-                                                               "Bins"       : 25,#50,
-                                                               "Min"        : 5090.0,#5100.0,
-                                                               "Max"        : 5350.0,
-                                                               "Unit"       : "MeV/c^{2}",
-                                                               "shiftMean"   : False,
-                                                               "mean"       : [5090,4900.0,5500.0],
-                                                               "sigma"     : [26.59,1.0,100.0]}
-    configdict["pdfList"]["Bs2DsPi"] = {}
-    configdict["pdfList"]["Bs2DsPi"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Bs2DsPi"]["Bd2DPi"]["BeautyMass"] = { "PDF"        : "Ipatia",
-                                                                 "Title"      : "B_{s}#rightarrowD_{s}#pi",
-                                                                 "Bins"       : 100,#50,
-                                                                 "Min"        : 5090.0,#5150.0,
-                                                                 "Max"        : 5600.0,#5450.0,
-                                                                 "Unit"       : "MeV/c^{2}",
-                                                                 "mean"       : [5310.0,5200.0,5400.0],
-                                                                 "sigma"      : [30.0,1.0,100.0],
-                                                                 "zeta"       : [0.01,0.0,0.1],
-                                                                 "fb"         : [0.0],
-                                                                 "l"          : [-2.0,-10.0,-0.01],
-                                                                 "a1"         : [3.0,0.01,10.0],
-                                                                 "a2"         : [3.0,0.01,10.0],
-                                                                 "n1"         : [3.0,0.01,10.0],
-                                                                 "n2"         : [3.0,0.01,10.0]}
-    configdict["pdfList"]["Bs2DsPi"]["Bd2DK"] = {}
-    configdict["pdfList"]["Bs2DsPi"]["Bd2DK"]["BeautyMass"] = { "PDF"        : "Ipatia",
-                                                                "Title"      : "B_{s}#rightarrowD_{s}#pi",
-                                                                "Bins"       : 50,#25,
-                                                                "Min"        : 5090.0,#5150.0,
-                                                                "Max"        : 5600.0,#5700.0,
-                                                                "Unit"       : "MeV/c^{2}",
-                                                                "mean"       : [5350.0,5000.0,6000.0],
-                                                                "sigma"      : [125.0,1.0,1000.0],
-                                                                "zeta"       : [0.0],
-                                                                "fb"         : [0.0],
-                                                                "l"          : [-2.0,-10.0,-0.01],
-                                                                "a1"         : [3.0,0.01,10.0],
-                                                                "a2"         : [3.0,0.01,10.0],
-                                                                "n1"         : [3.0,0.01,10.0],
-                                                                "n2"         : [3.0,0.01,10.0]}
-    #
-    configdict["pdfList"]["Comb"] = {}
-    configdict["pdfList"]["Comb"]["Bd2DPi"] = {}
-    configdict["pdfList"]["Comb"]["Bd2DPi"]["BeautyMass"] = { "PDF"          : "ExponentialPlusConstant",
-                                                              "Title"        : "Combinatorial",
-                                                              "Bins"         : 50,
-                                                              "Min"          : 5600.0,
-                                                              "Max"          : 6000.0,
-                                                              "Unit"         : "MeV/c^{2}",
-                                                              "cB"           : [-2.5e-03, -5.0, -1e-06],
-                                                              "fracExpo"     : [0.8,0.01,0.99]}
-    configdict["pdfList"]["Comb"]["Bd2DK"] = {}
-    configdict["pdfList"]["Comb"]["Bd2DK"]["BeautyMass"] = { "PDF"          : "ExponentialPlusConstant",
-                                                             "Title"        : "Combinatorial",
-                                                             "Bins"         : 50,
-                                                             "Min"          : 5600.0,
-                                                             "Max"          : 6000.0,
-                                                             "Unit"         : "MeV/c^{2}",
-                                                             "cB"           : [-2.5e-03, -5.0, -1e-06],
-                                                             "fracExpo"     : [0.8,0.01,0.99]}
-
-    #Dataset prefix
-    configdict["dataSetPrefix"] = {"Signal"   : "dataSetMC_Bd2DPi_",
-                                   "Bd2DK"    : "dataSetMC_Bd2DK_",
-                                   "Bd2DRho"  : "dataSetMC_Bd2DRho_",
-                                   "Bd2DstPi" : "dataSetMC_Bd2DstPi_",
-                                   "Bd2DKst"  : "dataSetMC_Bd2DKst_",
-                                   "Bs2DsPi"  : "dataSetMC_Bs2DsPi_",
-                                   "Comb"     : "dataSetCombPi_"}
-    #Axes titles
-    configdict["AxisTitle"] = {"BeautyMass": {"Bd2DPi":"D#pi mass (MeV/c^{2})","Bd2DK":"DK mass (MeV/c^{2})"}}
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForPIDeffMisID_narrowEta.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForPIDeffMisID_narrowEta.py
deleted file mode 100644
index 312b86aeb13c6bf4e7ee9776ac15ec3dc3ca0726..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForPIDeffMisID_narrowEta.py
+++ /dev/null
@@ -1,65 +0,0 @@
-from builtins import range
-from ROOT import *
-
-def getconfig() :
-
-    configdict = {}
-
-    from math import pi
-    from math import log
-
-    configdict["Calibration"] = {"Pi":
-                                 {"FileMU"   : "root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/PIDeff/PerfHists_Pi_Strip21_MagUp_Bd2DPi_narrow_P_ETA.root",
-                                  "FileMD"   : "root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/PIDeff/PerfHists_Pi_Strip21_MagDown_Bd2DPi_narrow_P_ETA.root",
-                                  "PassedDLLK<5.0" : "PassedHist_Pi_DLLK<5.0_All__Pi_P_Pi_Eta;1",
-                                  "TotalDLLK<5.0"  : "TotalHist_Pi_DLLK<5.0_All__Pi_P_Pi_Eta;1",
-                                  "PassedDLLK>5.0" : "PassedHist_Pi_DLLK>5.0_All__Pi_P_Pi_Eta;1",
-                                  "TotalDLLK>5.0"  : "TotalHist_Pi_DLLK>5.0_All__Pi_P_Pi_Eta;1",
-                                  "PassedDLLK<8.0" : "PassedHist_Pi_DLLK<8.0_All__Pi_P_Pi_Eta;1",
-                                  "TotalDLLK<8.0"  : "TotalHist_Pi_DLLK<8.0_All__Pi_P_Pi_Eta;1",
-                                  "PassedDLLK>-2.0" : "PassedHist_Pi_DLLK>-2.0_All__Pi_P_Pi_Eta;1",
-                                  "TotalDLLK>-2.0"  : "TotalHist_Pi_DLLK>-2.0_All__Pi_P_Pi_Eta;1"},
-                                 "K":
-                                 {"FileMU"   : "root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/PIDeff/PerfHists_K_Strip21_MagUp_Bd2DPi_narrow_P_ETA.root",
-                                  "FileMD"   : "root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/PIDeff/PerfHists_K_Strip21_MagDown_Bd2DPi_narrow_P_ETA.root",
-                                  "PassedDLLK<5.0" : "PassedHist_K_DLLK<5.0_All__K_P_K_Eta;1",
-                                  "TotalDLLK<5.0"  : "TotalHist_K_DLLK<5.0_All__K_P_K_Eta;1",
-                                  "PassedDLLK>5.0" : "PassedHist_K_DLLK>5.0_All__K_P_K_Eta;1",
-                                  "TotalDLLK>5.0"  : "TotalHist_K_DLLK>5.0_All__K_P_K_Eta;1",
-                                  "PassedDLLK<8.0" : "PassedHist_K_DLLK<8.0_All__K_P_K_Eta;1",
-                                  "TotalDLLK<8.0"  : "TotalHist_K_DLLK<8.0_All__K_P_K_Eta;1",
-                                  "PassedDLLK>-2.0" : "PassedHist_K_DLLK>-2.0_All__K_P_K_Eta;1",
-                                  "TotalDLLK>-2.0"  : "TotalHist_K_DLLK>-2.0_All__K_P_K_Eta;1"}
-                                 }
-
-    configdict["Tuple"] = {"Pi":
-                           {"FileMU"  : "root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DPi_Bd2DPiHypo_magUp_S21_beforeSelection.root",
-                            "FileMD"  : "root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DPi_Bd2DPiHypo_magDown_S21_beforeSelection.root",
-                            "Tree"    : "B2Dpi/DecayTree"},
-                           "K":
-                           {"FileMU"  : "root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DK_Bd2DPiHypo_magUp_S21_beforeSelection.root",
-                            "FileMD"  : "root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DK_Bd2DPiHypo_magDown_S21_beforeSelection.root",
-                            "Tree"    : "B2Dpi/DecayTree"}
-                           }
-
-    configdict["PIDleafPrefix"] = { "DLLK" : "PIDK" }
-
-    configdict["Variables"] = { "P":
-                                {"Suffix"        : "P",
-                                 "Title"         : "Momentum [MeV/c]",
-                                 "Type"          : "F",
-                                 "Min"           : 3980,
-                                 "Max"           : 200000,
-                                 "Binning"       : [2000] + [i for i in range(3980,200001,1980)] + [250000, 300000]
-                                 },
-                                "ETA":
-                                {"Suffix"       : "LOKI_ETA",
-                                 "Title"        : "Pseudorapidity",
-                                 "Type"         : "D",
-                                 "Min"          : 1.7,
-                                 "Max"          : 5.0,
-                                 "Binning"      : [ x*0.01 for x in range(150,505,5) ]
-                                 }
-                                }
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnBootstrapMC.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnBootstrapMC.py
deleted file mode 100644
index 087e5cae2239409154bbcd7e5c0c0dd025546213..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnBootstrapMC.py
+++ /dev/null
@@ -1,185 +0,0 @@
-"""configuration file for decaytime fit on signal bootstrapped MC"""
-def getconfig():
-
-    import math
-    from math import pi
-
-    configdict = {}
-
-    configdict["Decay"] = "Bd2DPi"
-
-    ############################################
-    # Define all basic variables
-    ############################################
-
-    configdict["BasicVariables"] = {}
-
-    configdict["BasicVariables"]["BeautyTime"]    = {"Range": [0.4, 12.0],
-                                                     "Bins": 40,
-                                                     "Name": "BeautyTime",  # the name is not used by the MDFitterSettings/Translator etc.
-                                                     "InputName": "obsTime"}
-    # if one wants to cut on the dataset the easiest way is to add a preselection in addition to the range defined here (preselection added
-    # by option --preselection on command line)
-
-    configdict["BasicVariables"]["BacCharge"]     = {"Range": [-1000.0, 1000.0],
-                                                     "Name": "BacCharge",
-                                                     "InputName": "BacCharge"}
-
-    #configdict["BasicVariables"]["TagDecTrue"]      = {"Range": [-1.0, 1.0],
-    #                                                   "Name": "TagDecOS",
-    #                                                   "InputName": "TagDecTrue"}
-
-    configdict["BasicVariables"]["TagDecOS"]      = {"Range": [-1.0, 1.0],
-                                                     "Name": "TagDecOS",
-                                                     "InputName": "TagDecOS"}
-
-    #configdict["BasicVariables"]["TagDecCheat"]      = {"Range": [-1.0, 1.0],
-    #                                                    "Name": "TagDecCheat",
-    #                                                    "InputName": "TagDecCheat"}
-
-    configdict["BasicVariables"]["TagDecSS"]      = {"Range": [-1.0, 1.0],
-                                                     "Name": "TagDecSS",
-                                                     "InputName": "TagDecSS"}  # available via mdSet->GetTagVar(i)
-    # the original specifier is available via mdSet->GetTagVarOutName(i)
-    # this name + "_idx" is used in the inputtree/dataset - so no flexibility in the beginning of the name as "TagDec" is used when checking for
-    # tagging variables in general at the beginning
-
-    configdict["BasicVariables"]["MistagOS"]      = {"Range": [0.0, 0.5],  # 0.4619
-                                                     "Name": "MistagOS",
-                                                     "InputName": "MistagOS"}
-
-    #configdict["BasicVariables"]["MistagCheat"]      = {"Range": [0.0, 0.5],
-    #                                                    "Name": "MistagCheat",
-    #                                                    "InputName": "MistagCheat"}
-
-    configdict["BasicVariables"]["MistagSS"]      = {"Range": [0.0, 0.5],  # 0.492
-                                                     "Name": "MistagSS",
-                                                     "InputName": "MistagSS"}
-
-    configdict["AdditionalVariables"] = {}
-    #configdict["AdditionalVariables"]["TrueID"]   = {"Range": [0.0, 1500.0],
-    #                                                 "InputName": "TrueID"}
-
-    ############################################
-    # Define all CPV and decay rate parameters
-    ############################################
-
-    # Parameters from https://svnweb.cern.ch/trac/lhcb/browser/DBASE/tags/Gen/DecFiles/v27r42/dkfiles/Bd_D-pi+,Kpipi=CPVDDalitz,DecProdCut.dec)
-    ModqOverp_d     = 1
-    ArgqOverp_d     = -0.746
-    ModpOverq_d     = 1
-    ArgpOverq_d     = 0.746
-    ModAf_d         = 0.0849
-    ArgAf_d         = 0.002278
-    ModAbarf_d      = 0.00137
-    ArgAbarf_d      = -1.128958
-    ModAfbar_d      = 0.00137
-    ArgAfbar_d      = 1.3145
-    ModAbarfbar_d   = 0.0849
-    ArgAbarfbar_d   = 0.002278
-
-    configdict["ACP"] = {}
-    configdict["ACP"]["Signal"] = {"Gamma": [1.0 / 1.519068, 0.1, 2.0],
-                                   "DeltaGamma": [0.0],
-                                   "DeltaM": [0.510, 0.01, 5.0],
-                                   #"ArgLf": [ArgqOverp_d + ArgAbarf_d - ArgAf_d],
-                                   #"ArgLbarfbar": [ArgpOverq_d + ArgAfbar_d - ArgAbarfbar_d],
-                                   #"ModLf": [ModAbarf_d / ModAf_d],
-                                   "C": [1.0],  # we neglect r^2 terms
-                                   "S": [-0.031],  # from decfile
-                                   "Sbar": [-0.029],  # from decfile
-                                   "D": [0],  # from DeltaGamma=0
-                                   "Dbar": [0],  # from DeltaGamma=0
-                                   "ParameteriseIntegral": True,
-                                   "CPlimit": {"upper": 2.0, "lower": -2.0},
-                                   "NBinsAcceptance": 0}  # keep at zero if using spline acceptance!
-
-    ############################################
-    # Define resolution and acceptance models
-    ############################################
-
-    configdict["ResolutionAcceptance"] = {}
-    configdict["ResolutionAcceptance"]["Signal"] = {}
-    configdict["ResolutionAcceptance"]["Signal"] = {"TimeErrorPDF": None,
-                                                    "Acceptance": # From ANA note v2
-                                                    {"Type": "Spline",
-                                                     "Float": True,
-                                                     "Extrapolate": True,
-                                                     #"ToFix": [3],
-                                                     #"KnotPositions" : [0.45, 1.0, 2.0, 2.5, 7.0, 12.0],
-                                                     #"KnotCoefficients": [0.5, 0.7, 1.0, 0.9, 0.85, 0.7, 0.7]},
-                                                     "KnotPositions": [0.5, 1.0, 1.5, 2.0, 2.3, 2.6, 3.0, 4.0, 10.0],
-                                                     "KnotCoefficients": [1.9440e-01, 3.3275e-01, 6.1444e-01, 8.6628e-01, 9.9600e-01, 1.0745e+00, 1.1083e+00,  1.1565e+00, 1.1946e+00]},
-                                                    "Resolution":  # From ANA note v2
-                                                    {"Type": "AverageModel",
-                                                     "Parameters": {'sigmas': [0.05491], 'fractions': []},
-                                                     "Bias": [0.0],
-                                                     "ScaleFactor": [1.0]}
-                                                    }
-
-    ############################################
-    # Define asymmetries
-    ############################################
-
-    configdict["ProductionAsymmetry"] = {}
-    configdict["DetectionAsymmetry"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = {}
-    configdict["DetectionAsymmetry"]["Signal"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = [-0.0124, -1.0, 1.0]  # from ANA note v2
-    configdict["DetectionAsymmetry"]["Signal"] = [0.0086, -1.0, 1.0]  # from arXiv:1408.0275v2 (OPPOSITE SIGN!!!)
-
-    ############################################
-    # Define taggers and their calibration
-    ############################################
-
-    configdict["Taggers"] = {}
-    configdict["Taggers"]["Signal"] = {}
-    configdict["Taggers"]["Signal"] = {"OS":  # From Bu MC, stat and syst combined
-                                       {"Calibration":
-                                        {"Type": "GLM",
-                                         "XML": ["/eos/lhcb/wg/b2oc/TD_DPi_3fb/calibrations/RLogisticCalibration_MCTruth_Bu2D0Pi_OS_20171114.xml"],
-                                         "tageff": [0.45, 0.01, 0.99],  # float in the fit
-                                         "tagasymm": [0.0]
-                                         },
-                                        "MistagPDF":
-                                        {"Type": "BuildTemplate"}
-                                        },
-                                       "SS":
-                                       {"Calibration":
-                                        {"Type": "GLM",
-                                         "XML": ["/eos/lhcb/wg/b2oc/TD_DPi_3fb/calibrations/RLogisticCalibration_MCTruth_Bd2JpsiKst_FullReweightAligned_SS_20171116.xml"],
-                                         "tageff": [0.92, 0.01, 0.99],  # float in the fit
-                                         "tagasymm": [0.0]
-                                         },
-                                        "MistagPDF":
-                                        {"Type": "BuildTemplate"}
-                                        }
-                                       }
-                                       
-
-    ############################################
-    # Choose parameters to fix
-    ############################################
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Cf')
-    configdict["constParams"].append('Cfbar')
-    #configdict["constParams"].append('Sf')
-    #configdict["constParams"].append('Sfbar')
-    configdict["constParams"].append('Df')
-    configdict["constParams"].append('Dfbar')
-    configdict["constParams"].append('.*scalefactor')
-    configdict["constParams"].append('resmodel00_sigma')
-
-    ############################################
-    # Build gaussian constraints
-    # See B2DXFitters/GaussianConstraintBuilder.py for documentation
-    ############################################
-
-    configdict["gaussCons"] = {}
-    # Constraint on DeltaM
-    configdict["gaussCons"]["deltaM"] = math.sqrt(0.0021 * 0.0021 + 0.0010 * 0.0010)  # 0.0023259
-    # Constraint on Gamma (error on gamma = rel. error on lifetime * gamma)
-    configdict["gaussCons"]["Gamma"] = (0.004 / 1.519068) * (1.0 / 1.519068)  # 0.0017313
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnData.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnData.py
deleted file mode 100644
index 9c69097a3c7dc7f6795596bd2863336070624e3b..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnData.py
+++ /dev/null
@@ -1,289 +0,0 @@
-def getconfig() :
-
-    import math
-    from math import pi
-
-    configdict = {}
-
-    configdict["Decay"] = "Bd2DPi"
-
-    ############################################
-    # Define all basic variables
-    ############################################
-
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5090,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersConst_M_flat"}
-
-    configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1904    ],
-                                                      "Name"                   : "CharmMass",
-                                                      "InputName"              : "obsMassDminus"}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.4,     12.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "obsTime"}
-
-    configdict["BasicVariables"]["BacP"]          = { "Range"                  : [2000.0,  650000.0],
-                                                      "Name"                   : "BacP",
-                                                      "InputName"              : "lab0_FitDaughtersConst_P0_P_flat"}
-
-    configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-                                                      "Name"                   : "BacPT",
-                                                      "InputName"              : "lab0_FitDaughtersConst_P0_PT_flat"}
-
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0, 999.0     ],
-                                                      "Name"                   : "BacPIDK",
-                                                      "InputName"              : "lab1_PIDK"}
-
-    configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-                                                      "Name"                   : "nTracks",
-                                                      "InputName"              : "nTracks"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_ID"}
-    
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecOS",
-                                                      "InputName"              : "TagDecOS"}
-    
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecSS",
-                                                      "InputName"              : "TagDecSS"}
-
-    configdict["BasicVariables"]["MistagOS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagOS",
-                                                      "InputName"              : "MistagOS"}
-
-    configdict["BasicVariables"]["MistagSS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagSS",
-                                                      "InputName"              : "MistagSS"}
-    '''
-    configdict["BasicVariables"]["TagDecOSExclusive"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                               "Name"                   : "TagDecOSExclusive",
-                                                               "InputName"              : "TagDecOSExclusive"}
-    
-    configdict["BasicVariables"]["TagDecSSExclusive"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                               "Name"                   : "TagDecSSExclusive",
-                                                               "InputName"              : "TagDecSSExclusive"}
-    
-    configdict["BasicVariables"]["MistagOSExclusive"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                               "Name"                   : "MistagOSExclusive",
-                                                               "InputName"              : "MistagOSExclusive"}
-    
-    configdict["BasicVariables"]["MistagSSExclusive"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                               "Name"                   : "MistagSSExclusive",
-                                                               "InputName"              : "MistagSSExclusive"}
-    '''
-    configdict["BasicVariables"]["BDTG"]           = { "Range"                  : [0.0, 1],
-                                                       "Name"                   : "BDTG",
-                                                       "InputName"              : "BDT_classifier"}
-
-    #Additional variables not foreseen before
-    configdict["AdditionalVariables"] = {}
-
-    configdict["AdditionalVariables"]["BeautyPhi"]      = { "Range"                  : [ -10.,    10.     ],
-                                                            "Name"                   : "BeautyPhi",
-                                                            "InputName"              : "lab0_LOKI_PHI"}
-
-    configdict["AdditionalVariables"]["BeautyEta"]      = { "Range"                  : [ 1.5,    10.0     ],
-                                                            "Name"                   : "BeautyEta",
-                                                            "InputName"              : "lab0_LOKI_ETA"}
-
-    configdict["AdditionalVariables"]["BeautyPT"]      = { "Range"                  : [ 0.0,    100000     ],
-                                                           "Name"                   : "BeautyPT",
-                                                           "InputName"              : "lab0_PT"}
-
-    configdict["AdditionalVariables"]["BeautyP"]      = { "Range"                  : [ 0.0,    3000000     ],
-                                                          "Name"                   : "BeautyP",
-                                                          "InputName"              : "lab0_P"}
-
-    configdict["AdditionalVariables"]["CharmTime"]    = { "Range"                  : [-10,     10    ],
-                                                          "Name"                   : "CharmTime",
-                                                          "InputName"              : "lab2_TAU"}
-
-    configdict["AdditionalVariables"]["nPV"]      = { "Range"                  : [ 0.0,    10     ],
-                                                      "Name"                   : "nPV",
-                                                      "InputName"              : "nPV"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo2BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo2BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo2BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo3BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo3BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo3BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo4BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo4BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo4BodyBBDTDecision_TOS"}
-
-
-    ############################################
-    # Define all CPV and decay rate parameters
-    ############################################
-
-    #Parameters from https://svnweb.cern.ch/trac/lhcb/browser/DBASE/tags/Gen/DecFiles/v27r42/dkfiles/Bd_D-pi+,Kpipi=CPVDDalitz,DecProdCut.dec)
-    ModqOverp_d     =  1
-    ArgqOverp_d     =  -0.746
-    ModpOverq_d     =  1
-    ArgpOverq_d     =  0.746
-    ModAf_d         =  0.0849
-    ArgAf_d         =  0.002278
-    ModAbarf_d      =  0.00137
-    ArgAbarf_d      =  -1.128958
-    ModAfbar_d      =  0.00137
-    ArgAfbar_d      =  1.3145
-    ModAbarfbar_d   =  0.0849
-    ArgAbarfbar_d   =  0.002278
-
-    configdict["ACP"] = {}
-    configdict["ACP"]["Signal"] = { "Gamma"                : [1.0 / 1.518, 0.1, 2.0], #From HFLAV (http://www.slac.stanford.edu/xorg/hflav/osc/summer_2017/#TAU)
-                                    "DeltaGamma"           : [0.0], # nominal
-                                    #"DeltaGamma"           : [0.007], #for systematics. HFLAV: DG/G=-0.002+/-0.010 -> DG=-0.001+/-0.007
-                                    "DeltaM"               : [0.505, 0.01, 2.0],  #From HFLAV (LHCb semileptonic): (http://www.slac.stanford.edu/xorg/hflav/osc/summer_2017/#DMD)
-                                    #"ArgLf"                : [ArgqOverp_d + ArgAbarf_d - ArgAf_d],
-                                    #"ArgLbarfbar"          : [ArgpOverq_d + ArgAfbar_d - ArgAbarfbar_d],
-                                    #"ModLf"                : [ModAbarf_d/ModAf_d],
-                                    "S"                   : [-0.031],
-                                    "Sbar"                : [-0.029],
-                                    "C"                   : [1.0], #nominal (r->0)
-                                    #"C"                   : [0.999402], #for systematics (r avg of BaBar, Belle = 0.0173)
-                                    "D"                   : [0.0], #nominal (DG=0)
-                                    "Dbar"                : [0.0], #nominal (DG=0)
-                                    #"D"                   : [-0.00973321], #for systematics (DG != 0)
-                                    #"Dbar"                : [-0.0151113], #for systematics (DG != 0)
-                                    "ParameteriseIntegral" : True,
-                                    "CPlimit"              : {"upper":1.0, "lower":-1.0},
-                                    "NBinsAcceptance"      : 0} #keep at zero if using spline acceptance!
-
-    ############################################
-    # Define resolution and acceptance models
-    ############################################
-
-    configdict["ResolutionAcceptance"] = {}
-    configdict["ResolutionAcceptance"]["Signal"] = {}
-    configdict["ResolutionAcceptance"]["Signal"] = {"TimeErrorPDF": None,
-                                                    "Acceptance":
-                                                    {"Type": "Spline",
-                                                     "Float": True,
-                                                     "Extrapolate": True,
-                                                     "KnotPositions": [0.5, 1.0, 1.5, 2.0, 2.3, 2.6, 3.0, 4.0, 10.0],
-                                                     "KnotCoefficients": [1.9440e-01, 3.3275e-01, 6.1444e-01, 8.6628e-01, 9.9600e-01, 1.0745e+00, 1.1083e+00,1.1565e+00, 1.1946e+00]},
-                                                    #"KnotCoefficients": [0.319338, 0.494221, 0.793542, 0.994526, 1.09258, 1.11702, 1.14026, 1.17504, 1.1541]}, #from full fit
-                                                    "Resolution":
-                                                    {"Type": "AverageModel",
-                                                     "Parameters": { 'sigmas': [ 0.05491 ], 'fractions': [] }, #0.05491 +- 0.00038
-                                                     "Bias": [0.0],
-                                                     "ScaleFactor": [1.0]}
-                                                    }
-
-    ############################################
-    # Define asymmetries
-    ############################################
-
-    configdict["ProductionAsymmetry"] = {}
-    configdict["DetectionAsymmetry"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = {}
-    configdict["DetectionAsymmetry"]["Signal"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = [-0.0124, -3.0, 3.0]
-    configdict["DetectionAsymmetry"]["Signal"] = [0.0086, -3.0, 3.0]
-
-    ############################################
-    # Define taggers and their calibration
-    ############################################
-
-    configdict["Taggers"] = {}
-    configdict["Taggers"]["Signal"] = {}
-    configdict["Taggers"]["Signal"] = {"OS" :
-                                       {"Calibration":  #from EPM on Bu->D0Pi data
-                                        { "Type"    : "GLM",
-                                          "XML"     : ["/eos/lhcb/wg/b2oc/TD_DPi_3fb/calibrations/RLogisticCalibration_Bu2D0Pi_OS_20171109.xml"],
-                                          "tageff"  : [0.43, 0.0, 1.0],
-                                          "tagasymm": [0.0]
-                                          },
-                                        "MistagPDF" :
-                                        {"Type"     : "BuildTemplate"}
-                                        },
-                                       "SS": #from EPM on Bd->J/psiK* data
-                                       {"Calibration":
-                                        { "Type"   : "GLM",
-                                          "XML"    : ["/eos/lhcb/wg/b2oc/TD_DPi_3fb/calibrations/RLogisticCalibration_Bd2JpsiKst_SS_20171101.xml"],
-                                          "tageff"  : [0.93, 0.0, 1.0],
-                                          "tagasymm": [0.0]
-                                          },
-                                        "MistagPDF" :
-                                        {"Type"     : "BuildTemplate"}
-                                        }
-                                       }
-
-    ############################################
-    # Choose parameters to fix
-    ############################################
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Cf')
-    configdict["constParams"].append('Cfbar')
-    configdict["constParams"].append('Df')
-    configdict["constParams"].append('Dfbar')
-    configdict["constParams"].append('.*scalefactor')
-    configdict["constParams"].append('resmodel00_sigma')
-
-    #configdict["constParams"].append('Sf')
-    #configdict["constParams"].append('Sfbar')
-
-    ############################################
-    # Build gaussian constraints
-    # See B2DXFitters/GaussianConstraintBuilder.py for documentation
-    ############################################
-    
-    configdict["gaussCons"] = {}
-    # Constraint on DeltaM
-    configdict["gaussCons"]["deltaM"] = math.sqrt( 0.0021*0.0021 + 0.001*0.001 )
-    # Constraint on Gamma (error on gamma = rel. error on lifetime * gamma)
-    configdict["gaussCons"]["Gamma"] = (0.004/1.518) * (1.0/1.518)
-    # Multivariate constraint for OS combination
-    # from /eos/lhcb/wg/b2oc/TD_DPi_3fb/calibrations/RLogisticCalibration_Bu2D0Pi_OS_20171109.xml
-    #ospedix='_RLogisticCalibration_Bu2D0Pi_OS_20171109'
-    #configdict["gaussCons"]["multivarOSCalib"] = [['p_0'+ospedix, 'p_1'+ospedix, 'p_2'+ospedix, 'p_3'+ospedix, 'p_4'+ospedix,
-    #                                               'dp_0'+ospedix, 'dp_1'+ospedix, 'dp_2'+ospedix, 'dp_3'+ospedix, 'dp_4'+ospedix], #parname
-    #                                              [0.018861, 0.022384, 0.0083159, 0.10295, 0.46093, 0.037722, 0.044769, 0.016632, 0.20589, 0.92186], #errors
-    #                                              [[1,         -0.1114,       -0.060699,       0.0093426,        0.015863,        0.048808,       -0.047049,        0.039906,       -0.029982,       -0.046388],
-    #                                               [1,       -0.089184,        -0.18692,       -0.090706,       -0.047049,         0.10887,        -0.14672,         0.08442,         0.13518],
-    #                                               [1,        0.072613,        -0.26522,        0.039906,        -0.14672,         0.29374,        -0.14009,        -0.22838],
-    #                                               [1,         0.82556,       -0.029982,         0.08442,        -0.14009,         0.17804,         0.14323],
-    #                                               [1,       -0.046388,         0.13518,        -0.22838,         0.14323,         0.34924],
-    #                                               [1,         -0.1114,       -0.060699,       0.0093426,        0.015863],
-    #                                               [1,       -0.089184,        -0.18692,       -0.090706],
-    #                                               [1,        0.072613,        -0.26522,],
-    #                                               [1,         0.82556],
-    #                                               [1]]]
-    # Multivariate constraint for SS combination
-    #sspedix = '_RLogisticCalibration_Bd2JpsiKst_SS_20171101'
-    #configdict["gaussCons"]["multivarSSCalib"] = [['p_0'+sspedix, 'p_1'+sspedix, 'dp_0'+sspedix, 'dp_1'+sspedix], #parname
-    #                                              [0.059185, 0.065243, 0.084341, 0.093665], #errors
-    #                                              [[1,        0.062456,       -0.028549,       -0.038885],
-    #                                               [1,       -0.039147,       -0.044807],
-    #                                               [1,         0.10574],
-    #                                               [1]]]
-    
-    ############################################
-    # Choose parameters to blind
-    ############################################
-
-    configdict["blindParams"] = []
-    configdict["blindParams"].append('Sf')
-    configdict["blindParams"].append('Sfbar')
-
-    ############################################
-    # Choose parameters to perform the
-    # likelihood scan for
-    ############################################
-
-    configdict["LikelihoodScan"] = []
-    configdict["LikelihoodScan"].append("Sf")
-    configdict["LikelihoodScan"].append("DetAsymm")
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnData_Nov2016.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnData_Nov2016.py
deleted file mode 100644
index b042aa263fc6dd5aba1f57f6225d2b04d5c1e557..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnData_Nov2016.py
+++ /dev/null
@@ -1,242 +0,0 @@
-def getconfig() :
-
-    import math
-    from math import pi
-
-    configdict = {}
-
-    configdict["Decay"] = "Bd2DPi"
-
-    ############################################
-    # Define all basic variables
-    ############################################
-
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5090,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersConst_M_flat"}
-
-    configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1904    ],
-                                                      "Name"                   : "CharmMass",
-                                                      "InputName"              : "obsMassDminus"}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.4,     15.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "lab0_FitDaughtersPCConst_ctau_flat"}
-
-    configdict["BasicVariables"]["BacP"]          = { "Range"                  : [2000.0,  650000.0],
-                                                      "Name"                   : "BacP",
-                                                      "InputName"              : "lab0_FitDaughtersConst_P0_P_flat"}
-
-    configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-                                                      "Name"                   : "BacPT",
-                                                      "InputName"              : "lab0_FitDaughtersConst_P0_PT_flat"}
-
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0, 999.0     ],
-                                                      "Name"                   : "BacPIDK",
-                                                      "InputName"              : "lab1_PIDK"}
-
-    configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-                                                      "Name"                   : "nTracks",
-                                                      "InputName"              : "nTracks"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_ID"}
-
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecOS",
-                                                      "InputName"              : "TagDecOS"}
-
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecSS",
-                                                      "InputName"              : "TagDecSS"}
-
-    configdict["BasicVariables"]["MistagOS"]      = { "Range"                  : [ 0.0,    0.48     ],
-                                                      "Name"                   : "MistagOS",
-                                                      "InputName"              : "MistagOS"}
-
-    configdict["BasicVariables"]["MistagSS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagSS",
-                                                      "InputName"              : "MistagSS"}
-
-    configdict["BasicVariables"]["BDTG"]           = { "Range"                  : [0.0, 1],
-                                                       "Name"                   : "BDTG",
-                                                       "InputName"              : "BDT_classifier"}
-
-    #Additional variables not foreseen before
-    configdict["AdditionalVariables"] = {}
-
-    configdict["AdditionalVariables"]["BeautyPhi"]      = { "Range"                  : [ -10.,    10.     ],
-                                                            "Name"                   : "BeautyPhi",
-                                                            "InputName"              : "lab0_LOKI_PHI"}
-
-    configdict["AdditionalVariables"]["BeautyEta"]      = { "Range"                  : [ 1.5,    10.0     ],
-                                                            "Name"                   : "BeautyEta",
-                                                            "InputName"              : "lab0_LOKI_ETA"}
-
-    configdict["AdditionalVariables"]["BeautyPT"]      = { "Range"                  : [ 0.0,    100000     ],
-                                                           "Name"                   : "BeautyPT",
-                                                           "InputName"              : "lab0_PT"}
-
-    configdict["AdditionalVariables"]["BeautyP"]      = { "Range"                  : [ 0.0,    3000000     ],
-                                                          "Name"                   : "BeautyP",
-                                                          "InputName"              : "lab0_P"}
-
-    configdict["AdditionalVariables"]["nPV"]      = { "Range"                  : [ 0.0,    10     ],
-                                                      "Name"                   : "nPV",
-                                                      "InputName"              : "nPV"}
-
-
-    ############################################
-    # Define all CPV and decay rate parameters
-    ############################################
-
-    #Parameters from https://svnweb.cern.ch/trac/lhcb/browser/DBASE/tags/Gen/DecFiles/v27r42/dkfiles/Bd_D-pi+,Kpipi=CPVDDalitz,DecProdCut.dec)
-    ModqOverp_d     =  1
-    ArgqOverp_d     =  -0.746
-    ModpOverq_d     =  1
-    ArgpOverq_d     =  0.746
-    ModAf_d         =  0.0849
-    ArgAf_d         =  0.002278
-    ModAbarf_d      =  0.00137
-    ArgAbarf_d      =  -1.128958
-    ModAfbar_d      =  0.00137
-    ArgAfbar_d      =  1.3145
-    ModAbarfbar_d   =  0.0849
-    ArgAbarfbar_d   =  0.002278
-
-    configdict["ACP"] = {}
-    configdict["ACP"]["Signal"] = { "Gamma"                : [1.0 / 1.518, 0.1, 2.0], #From HFLAV (http://www.slac.stanford.edu/xorg/hflav/osc/summer_2017/#TAU)
-                                    "DeltaGamma"           : [0.0], # nominal
-                                    #"DeltaGamma"           : [0.007], #for systematics. HFLAV: DG/G=-0.002+/-0.010 -> DG=-0.001+/-0.007
-                                    "DeltaM"               : [0.505, 0.01, 2.0],  #From HFLAV (LHCb semileptonic): (http://www.slac.stanford.edu/xorg/hflav/osc/summer_2017/#DMD)
-                                    #"ArgLf"                : [ArgqOverp_d + ArgAbarf_d - ArgAf_d],
-                                    #"ArgLbarfbar"          : [ArgpOverq_d + ArgAfbar_d - ArgAbarfbar_d],
-                                    #"ModLf"                : [ModAbarf_d/ModAf_d],
-                                    "S"                   : [-0.031],
-                                    "Sbar"                : [0.029],
-                                    "C"                   : [1.0], #nominal (r->0)
-                                    #"C"                   : [0.999402], #for systematics (r avg of BaBar, Belle = 0.0173)
-                                    "D"                   : [0.0], #nominal (DG=0)
-                                    "Dbar"                : [0.0], #nominal (DG=0)
-                                    #"D"                   : [-0.00973321], #for systematics (DG != 0)
-                                    #"Dbar"                : [-0.0151113], #for systematics (DG != 0)
-                                    "ParameteriseIntegral" : True,
-                                    "CPlimit"              : {"upper":1.0, "lower":-1.0},
-                                    "NBinsAcceptance"      : 0} #keep at zero if using spline acceptance!
-
-    ############################################
-    # Define resolution and acceptance models
-    ############################################
-
-    configdict["ResolutionAcceptance"] = {}
-    configdict["ResolutionAcceptance"]["Signal"] = {}
-    configdict["ResolutionAcceptance"]["Signal"] = {"TimeErrorPDF": None,
-                                                    "Acceptance":
-                                                    {"Type": "Spline",
-                                                     "Float": True,
-                                                     "Extrapolate": True,
-                                                     "KnotPositions": [0.5, 1.0, 1.5, 2.0, 3.0, 12.0],
-                                                     "KnotCoefficients": [1.9440e-01, 3.3275e-01, 6.1444e-01, 8.6628e-01, 9.9600e-01, 1.0745e+00]},
-                                                    "Resolution":
-                                                    {"Type": "AverageModel",
-                                                     "Parameters": { 'sigmas': [ 0.05491 ], 'fractions': [] }, #0.05491 +- 0.00038
-                                                     "Bias": [0.0],
-                                                     "ScaleFactor": [1.0]}
-                                                    }
-
-    ############################################
-    # Define asymmetries
-    ############################################
-
-    configdict["ProductionAsymmetry"] = {}
-    configdict["DetectionAsymmetry"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = {}
-    configdict["DetectionAsymmetry"]["Signal"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = [-0.0124, -3.0, 3.0]
-    configdict["DetectionAsymmetry"]["Signal"] = [0.0086, -3.0, 3.0]
-
-    ############################################
-    # Define taggers and their calibration
-    ############################################
-
-    configdict["Taggers"] = {}
-    configdict["Taggers"]["Signal"] = {}
-    configdict["Taggers"]["Signal"] = {"OS" : #From https://twiki.cern.ch/twiki/pub/LHCbPhysics/B2OCTD_B2Dpi_3fb/LHCb-ANA-2016-064_v5.pdf
-                                       {"Calibration":
-                                        { "Type"   : "Linear",
-                                          "p0"       : [0.3775],# 0.0, 1.0],
-                                          "p1"       : [1.028],# 0.5, 1.5],
-                                          "deltap0"  : [0.0111],# -1.0, 1.0],
-                                          "deltap1"  : [0.022],# -1.0, 1.0],
-                                          "avgeta"   : [0.349980],#<eta> on Bu->D0Pi
-                                          "tageff"   : [1.0],#[0.35, 0.0, 1.0],
-                                          "tagasymm" : [0.0]
-                                          },
-                                        "MistagPDF" :
-                                        {"Type"     : "BuildTemplate"}
-                                        },
-                                       "SS": #From https://twiki.cern.ch/twiki/pub/LHCbPhysics/B2OCTD_B2Dpi_3fb/LHCb-ANA-2016-064_v5.pdf
-                                       {"Calibration":
-                                        { "Type"   : "Linear",
-                                          "p0"       : [0.4424],# 0.0, 1.0],
-                                          "p1"       : [0.813],# 0.5, 1.5],
-                                          "deltap0"  : [0.0006],# -1.0, 1.0],
-                                          "deltap1"  : [0.007],# -1.0, 1.0],
-                                          "avgeta"   : [0.435], #<eta> on Bd->J/psiK*
-                                          "tageff"   : [1.0],#[0.816, 0.0, 1.0],
-                                          "tagasymm" : [0.0]
-                                          },
-                                        "MistagPDF" :
-                                        {"Type"     : "BuildTemplate"}
-                                        }
-                                       }
-
-    ############################################
-    # Choose parameters to fix
-    ############################################
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Cf')
-    configdict["constParams"].append('Cfbar')
-    configdict["constParams"].append('Df')
-    configdict["constParams"].append('Dfbar')
-    configdict["constParams"].append('.*scalefactor')
-    configdict["constParams"].append('resmodel00_sigma')
-
-    #configdict["constParams"].append('Sf')
-    #configdict["constParams"].append('Sfbar')
-
-    ############################################
-    # Build gaussian constraints
-    # See B2DXFitters/GaussianConstraintBuilder.py for documentation
-    ############################################
-    
-    configdict["gaussCons"] = {}
-    # Constraint on resolution
-    #configdict["gaussCons"]["resmodel00_sigma"] = 0.00038
-    # Constraint on DeltaM
-    configdict["gaussCons"]["deltaM"] = math.sqrt( 0.0021*0.0021 + 0.001*0.001 )
-    # Constraint on Gamma (error on gamma = rel. error on lifetime * gamma)
-    configdict["gaussCons"]["Gamma"] = (0.004/1.518) * (1.0/1.518)
-    
-    ############################################
-    # Choose parameters to blind
-    ############################################
-
-    configdict["blindParams"] = []
-    configdict["blindParams"].append('Sf')
-    configdict["blindParams"].append('Sfbar')
-
-    ############################################
-    # Choose parameters to perform the
-    # likelihood scan for
-    ############################################
-
-    configdict["LikelihoodScan"] = []
-    #configdict["LikelihoodScan"].append("Sf")
-    #configdict["LikelihoodScan"].append("Sfbar")
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnData_alex.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnData_alex.py
deleted file mode 100644
index 07222439d293500db3628f0d6cbffcade949d023..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnData_alex.py
+++ /dev/null
@@ -1,236 +0,0 @@
-from __future__ import division
-from past.utils import old_div
-def getconfig() :
-
-    import math
-    from math import pi
-
-    configdict = {}
-
-    configdict["Decay"] = "Bd2DPi"
-
-    ############################################
-    # Define all basic variables
-    ############################################
-
-    configdict["BasicVariables"] = {}
-    # configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5090,    6000    ],
-    #                                                   "Name"                   : "BeautyMass",
-    #                                                   "InputName"              : "lab0_FitDaughtersConst_M_flat"}
-
-    # configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1904    ],
-    #                                                   "Name"                   : "CharmMass",
-    #                                                   "InputName"              : "obsMassDminus"}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.4,     15.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_ctau_flat"}
-
-    # configdict["BasicVariables"]["BacP"]          = { "Range"                  : [2000.0,  650000.0],
-    #                                                   "Name"                   : "BacP",
-    #                                                   "InputName"              : "lab0_FitDaughtersConst_P0_P_flat"}
-
-    # configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-    #                                                   "Name"                   : "BacPT",
-    #                                                   "InputName"              : "lab0_FitDaughtersConst_P0_PT_flat"}
-
-    # configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0, 999.0     ],
-    #                                                   "Name"                   : "BacPIDK",
-    #                                                   "InputName"              : "lab1_PIDK"}
-
-    # configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-    #                                                   "Name"                   : "nTracks",
-    #                                                   "InputName"              : "nTracks"}
-
-    # configdict["BasicVariables"]["BeautyTimeErr"] = { "Range"                  : [0.01,    0.1     ],
-    #                                                   "Name"                   : "BeautyTimeErr",
-    #                                                   "InputName"              : "lab0_FitDaughtersPVConst_ctauErr_flat"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_ID"}
-
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range"                  : [-1.0, 0.0, 1.0],
-                                                      "Name"                   : "TagDecOS",
-                                                      "InputName"              : "lab0_TAGDECISION_OS"}
-
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range"                  : [-1.0, 0.0, 1.0],
-                                                      "Name"                   : "TagDecSS",
-                                                      "InputName"              : "lab0_SS_PionBDT_DEC"}
-
-    configdict["BasicVariables"]["MistagOS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagOS",
-                                                      "InputName"              : "lab0_TAGOMEGA_OS"}
-
-    configdict["BasicVariables"]["MistagSS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagSS",
-                                                      "InputName"              : "lab0_SS_PionBDT_PROB"}
-
-    # configdict["BasicVariables"]["BDTG"]           = { "Range"                  : [0.05, 1],
-    #                                                    "Name"                   : "BDTG",
-    #                                                    "InputName"              : "BDT_classifier"}
-
-    #Additional variables not foreseen before
-    configdict["AdditionalVariables"] = {}
-
-    # configdict["AdditionalVariables"]["BeautyPhi"]      = { "Range"                  : [ -10.,    10.     ],
-    #                                                         "Name"                   : "BeautyPhi",
-    #                                                         "InputName"              : "lab0_LOKI_PHI"}
-
-    # configdict["AdditionalVariables"]["BeautyEta"]      = { "Range"                  : [ 1.5,    10.0     ],
-    #                                                         "Name"                   : "BeautyEta",
-    #                                                         "InputName"              : "lab0_LOKI_ETA"}
-
-    # configdict["AdditionalVariables"]["BeautyPT"]      = { "Range"                  : [ 0.0,    100000     ],
-    #                                                        "Name"                   : "BeautyPT",
-    #                                                        "InputName"              : "lab0_PT"}
-
-    # configdict["AdditionalVariables"]["nPV"]      = { "Range"                  : [ 0.0,    10     ],
-    #                                                   "Name"                   : "nPV",
-    #                                                   "InputName"              : "nPV"}
-
-
-    ############################################
-    # Define all CPV and decay rate parameters
-    ############################################
-
-    #Parameters from https://svnweb.cern.ch/trac/lhcb/browser/DBASE/tags/Gen/DecFiles/v27r42/dkfiles/Bd_D-pi+,Kpipi=CPVDDalitz,DecProdCut.dec)
-    ModqOverp_d     =  1
-    ArgqOverp_d     =  -0.746
-    ModpOverq_d     =  1
-    ArgpOverq_d     =  0.746
-    ModAf_d         =  0.0849
-    ArgAf_d         =  0.002278
-    ModAbarf_d      =  0.00137
-    ArgAbarf_d      =  -1.128958
-    ModAfbar_d      =  0.00137
-    ArgAfbar_d      =  1.3145
-    ModAbarfbar_d   =  0.0849
-    ArgAbarfbar_d   =  0.002278
-
-    configdict["ACP"] = {}
-    configdict["ACP"]["Signal"] = { "Gamma"                : [0.658],
-                                    "DeltaGamma"           : [0.0],
-                                    "DeltaM"               : [0.51],
-                                    "ArgLf"                : [ArgqOverp_d + ArgAbarf_d - ArgAf_d],
-                                    "ArgLbarfbar"          : [ArgpOverq_d + ArgAfbar_d - ArgAbarfbar_d],
-                                    "ModLf"                : [old_div(ModAbarf_d,ModAf_d)],
-                                    "ParameteriseIntegral" : True,
-                                    "CPlimit"              : {"upper":2.0, "lower":-2.0},
-                                    "NBinsAcceptance"      : 0} #keep at zero if using spline acceptance!
-
-    ############################################
-    # Define resolution and acceptance models
-    ############################################
-
-    p0 = 1.064
-    p1 = -0.04554
-
-    configdict["ResolutionAcceptance"] = {}
-    configdict["ResolutionAcceptance"]["Signal"] = {}
-    configdict["ResolutionAcceptance"]["Signal"] = {"TimeErrorPDF": None,
-                                                    "Acceptance":
-                                                    {"Type": "Spline",
-                                                     "Float": True,
-                                                     "KnotPositions" : [ 0.5, 1.0, 1.5, 2.0, 3.0, 12.0 ],
-                                                     "KnotCoefficients" : [ 0.4067, 0.6005, 0.9140,
-                                                                            1.1096, 1.2761, 1.4256 ]},
-                                                    "Resolution":
-                                                    {"Type": "AverageModel",
-                                                     "Parameters": { 'sigmas': [ 0.05491 ], 'fractions': [] }, #use expectation, for now
-                                                     "Bias": [0.0],
-                                                     "ScaleFactor": [1.0]}
-                                                    }
-
-    ############################################
-    # Define asymmetries
-    ############################################
-
-    configdict["ProductionAsymmetry"] = {}
-    configdict["DetectionAsymmetry"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = {}
-    configdict["DetectionAsymmetry"]["Signal"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = [0.0]
-    configdict["DetectionAsymmetry"]["Signal"] = [0.0] #???
-
-    ############################################
-    # Define taggers and their calibration
-    ############################################
-
-    configdict["Taggers"] = {}
-    configdict["Taggers"]["Signal"] = {}
-    configdict["Taggers"]["Signal"] = {"OS" : #Take it uncalibrated for now
-                                       {"Calibration":
-                                        {"p0"       : [0.37],
-                                         "p1"       : [1.0],
-                                         "deltap0"  : [0.0],
-                                         "deltap1"  : [0.0],
-                                         "avgeta"   : [0.37],
-                                         "tageff"   : [0.8,0.0,1.0],
-                                         "tagasymm" : [0.0]
-                                         },
-                                        "MistagPDF" :
-                                        {"Type"     : "BuildTemplate"}
-                                        },
-                                       "SS": #Take it uncalibrated for now
-                                       {"Calibration":
-                                        {"p0"       : [0.46],
-                                         "p1"       : [1.0],
-                                         "deltap0"  : [0.0],
-                                         "deltap1"  : [0.0],
-                                         "avgeta"   : [0.46],
-                                         "tageff"   : [0.8, 0.0, 1.0],
-                                         "tagasymm" : [0.0]
-                                         },
-                                        "MistagPDF" :
-                                        {"Type"     : "BuildTemplate"}
-                                       }
-                                      }
-
-    ############################################
-    # Choose parameters to fix
-    ############################################
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Cf')
-    configdict["constParams"].append('Cfbar')
-    configdict["constParams"].append('Df')
-    configdict["constParams"].append('Dfbar')
-    #configdict["constParams"].append('Sf')
-    #configdict["constParams"].append('Sfbar')
-    configdict["constParams"].append('.*scalefactor')
-
-    ############################################
-    # Build gaussian constraints
-    # See B2DXFitters/GaussianConstraintBuilder.py for documentation
-    ############################################
-
-    configdict["gaussCons"] = {}
-    # Error on production asymmetry = add in quadrature stat. and syst. errors
-    # configdict["gaussCons"]["ProdAsymm"] = math.sqrt(0.008079*0.008079 + 0.001428*0.001428)
-    #Error on gamma = gamma central value * relative uncertainty on lifetime (= relative uncertainty on gamma)
-    # configdict["gaussCons"]["Gamma"] = (1.0 / 1.520) * (0.004 / 1.520)
-    #Error  on detection asymmetry = 1%
-    # configdict["gaussCons"]["DetAsymm"] = 0.01
-    #Error on Delta M
-    # configdict["gaussCons"]["deltaM"] = 0.0019
-
-    ############################################
-    # Choose parameters to blind
-    ############################################
-
-    configdict["blindParams"] = []
-    # configdict["blindParams"].append('Sf')
-    # configdict["blindParams"].append('Sfbar')
-
-    ############################################
-    # Choose parameters to perform the
-    # likelihood scan for
-    ############################################
-
-    configdict["LikelihoodScan"] = []
-    #configdict["LikelihoodScan"].append("Sf")
-    #configdict["LikelihoodScan"].append("Sfbar")
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnMC.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnMC.py
deleted file mode 100644
index 0108dc6a9b19653c4643867750b534c24bd56fda..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnMC.py
+++ /dev/null
@@ -1,212 +0,0 @@
-"""configuration file for decaytime fit on signal bootstrapped MC"""
-def getconfig():
-
-    import math
-    from math import pi
-
-    configdict = {}
-
-    configdict["Decay"] = "Bd2DPi"
-
-    ############################################
-    # Define all basic variables
-    ############################################
-
-    configdict["BasicVariables"] = {}
-
-    configdict["BasicVariables"]["BeautyTime"]    = {"Range": [0.4, 12.0],
-                                                     "Bins": 40,
-                                                     "Name": "BeautyTime",  # the name is not used by the MDFitterSettings/Translator etc.
-                                                     "InputName": "obsTime"}
-    # if one wants to cut on the dataset the easiest way is to add a preselection in addition to the range defined here (preselection added
-    # by option --preselection on command line)
-
-    configdict["BasicVariables"]["BacCharge"]     = {"Range": [-1000.0, 1000.0],
-                                                     "Name": "BacCharge",
-                                                     "InputName": "BacCharge"}
-
-    #configdict["BasicVariables"]["TagDecTrue"]      = {"Range": [-1.0, 1.0],
-    #                                                   "Name": "TagDecTrue",
-    #                                                   "InputName": "TagDecTrue"}
-
-    configdict["BasicVariables"]["TagDecOS"]      = {"Range": [-1.0, 1.0],
-                                                     "Name": "TagDecOS",
-                                                     "InputName": "TagDecOS"}
-
-    configdict["BasicVariables"]["TagDecSS"]      = {"Range": [-1.0, 1.0],
-                                                     "Name": "TagDecSS",
-                                                     "InputName": "TagDecSS"}  # available via mdSet->GetTagVar(i)
-    # the original specifier is available via mdSet->GetTagVarOutName(i)
-    # this name + "_idx" is used in the inputtree/dataset - so no flexibility in the beginning of the name as "TagDec" is used when checking for
-    # tagging variables in general at the beginning
-
-    #configdict["BasicVariables"]["MistagCheat"]      = {"Range": [0.0, 0.5],
-    #                                                    "Name": "MistagCheat",
-    #                                                    "InputName": "MistagCheat"}
-
-    configdict["BasicVariables"]["MistagOS"]      = {"Range": [0.0, 0.5],  # 0.4619
-                                                     "Name": "MistagOS",
-                                                     "InputName": "MistagOS"}
-
-    configdict["BasicVariables"]["MistagSS"]      = {"Range": [0.0, 0.5],  # 0.492
-                                                     "Name": "MistagSS",
-                                                     "InputName": "MistagSS"}
-
-    #configdict["AdditionalVariables"] = {}
-    #configdict["AdditionalVariables"]["TrueID"]   = {"Range": [0.0, 1500.0],
-    #                                                 "InputName": "TrueID"}
-
-    ############################################
-    # Define all CPV and decay rate parameters
-    ############################################
-
-    # Parameters from https://svnweb.cern.ch/trac/lhcb/browser/DBASE/tags/Gen/DecFiles/v27r42/dkfiles/Bd_D-pi+,Kpipi=CPVDDalitz,DecProdCut.dec)
-    ModqOverp_d     = 1
-    ArgqOverp_d     = -0.746
-    ModpOverq_d     = 1
-    ArgpOverq_d     = 0.746
-    ModAf_d         = 0.0849
-    ArgAf_d         = 0.002278
-    ModAbarf_d      = 0.00137
-    ArgAbarf_d      = -1.128958
-    ModAfbar_d      = 0.00137
-    ArgAfbar_d      = 1.3145
-    ModAbarfbar_d   = 0.0849
-    ArgAbarfbar_d   = 0.002278
-    
-    configdict["ACP"] = {}
-    configdict["ACP"]["Signal"] = {"Gamma": [1.0 / 1.519068, 0.1, 2.0],
-                                   "DeltaGamma": [0.0],
-                                   "DeltaM": [0.510, 0.01, 5.0],
-                                   #"ArgLf": [ArgqOverp_d + ArgAbarf_d - ArgAf_d],
-                                   #"ArgLbarfbar": [ArgpOverq_d + ArgAfbar_d - ArgAbarfbar_d],
-                                   #"ModLf": [ModAbarf_d / ModAf_d],
-                                   "C": [1.0],  # we neglect r^2 terms
-                                   "S": [-0.031],  # from decfile
-                                   "Sbar": [-0.029],  # from decfile
-                                   "D": [0],  # from DeltaGamma=0
-                                   "Dbar": [0],  # from DeltaGamma=0
-                                   "ParameteriseIntegral": True,
-                                   "CPlimit": {"upper": 2.0, "lower": -2.0},
-                                   "NBinsAcceptance": 0}  # keep at zero if using spline acceptance!
-                                                     
-    ############################################
-    # Define resolution and acceptance models
-    ############################################
-                                                     
-    configdict["ResolutionAcceptance"] = {}
-    configdict["ResolutionAcceptance"]["Signal"] = {}
-    configdict["ResolutionAcceptance"]["Signal"] = {"TimeErrorPDF": None,
-                                                    "Acceptance":  # From ANA note v2
-                                                    {"Type": "Spline",
-                                                     "Float": True,
-                                                     "Extrapolate": True,
-                                                     "KnotPositions": [0.5, 1.0, 1.5, 2.0, 2.3, 2.6, 3.0, 4.0, 10.0],
-                                                     "KnotCoefficients": [1.9440e-01, 3.3275e-01, 6.1444e-01, 8.6628e-01, 9.9600e-01, 1.0745e+00, 1.1083e+00,  1.1565e+00, 1.1946e+00]},
-                                                    "Resolution":  # From ANA note v2
-                                                    {"Type": "AverageModel",
-                                                     "Parameters": {'sigmas': [0.05491], 'fractions': []},
-                                                     "Bias": [0.0],
-                                                     "ScaleFactor": [1.0]}
-                                                    }
-
-    ############################################
-    # Define asymmetries
-    ############################################
-
-    configdict["ProductionAsymmetry"] = {}
-    configdict["DetectionAsymmetry"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = {}
-    configdict["DetectionAsymmetry"]["Signal"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = [-0.0124, -1.0, 1.0]  # from ANA note v2
-    configdict["DetectionAsymmetry"]["Signal"] = [0.0086, -1.0, 1.0]  # from arXiv:1408.0275v2 (OPPOSITE SIGN!!!)
-    # configdict["DetectionAsymmetry"]["Signal"] = [0.0, -1.5, 1.5]  # sin2beta
-
-    ############################################
-    # Define taggers and their calibration
-    ############################################
-    
-    configdict["Taggers"] = {}
-    configdict["Taggers"]["Signal"] = {}
-    configdict["Taggers"]["Signal"] = {"OS":
-                                       {"Calibration":
-                                        {"Type": "GLM",
-                                         "XML": ["/eos/lhcb/wg/b2oc/TD_DPi_3fb/calibrations/RLogisticCalibration_MCTruth_Bu2D0Pi_OS_20171114.xml"],
-                                         "tageff": [0.45, 0.01, 0.99],
-                                         "tagasymm": [0.0]
-                                         },
-                                        "MistagPDF":
-                                        {"Type": "BuildTemplate"}
-                                        },
-                                       "SS":
-                                       {"Calibration":
-                                        {"Type": "GLM",
-                                         "XML": ["/eos/lhcb/wg/b2oc/TD_DPi_3fb/calibrations/RLogisticCalibration_MCTruth_Bd2JpsiKst_FullReweightAligned_SS_20171116.xml"],
-                                         "tageff": [0.92, 0.01, 0.99],
-                                         "tagasymm": [0.0]
-                                         },
-                                        "MistagPDF":
-                                        {"Type": "BuildTemplate"}
-                                        }
-                                       }
-    #configdict["Taggers"]["Signal"] = {"OS":  #Cheated tagger
-    #                                   {"Calibration":
-    #                                    {"Type"     : "Linear",
-    #                                     "p0"       : [0.370029],
-    #                                     "p1"       : [1.0],
-    #                                     "deltap0"  : [0.0],
-    #                                     "deltap1"  : [0.0],
-    #                                     "avgeta"   : [0.370029],
-    #                                     "tageff"   : [1.0],
-    #                                     "tagasymm" : [0.0]
-    #                                     },
-    #                                    "MistagPDF":
-    #                                    {"Type": "BuildTemplate"}
-    #                                    }
-    #                                   }
-
-    ############################################
-    # Choose parameters to fix
-    ############################################
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Cf')
-    configdict["constParams"].append('Cfbar')
-    #configdict["constParams"].append('Sf')
-    #configdict["constParams"].append('Sfbar')
-    configdict["constParams"].append('Df')
-    configdict["constParams"].append('Dfbar')
-    configdict["constParams"].append('.*scalefactor')
-
-    configdict["constParams"].append('resmodel00_sigma')
-
-    ############################################
-    # Build gaussian constraints
-    # See B2DXFitters/GaussianConstraintBuilder.py for documentation
-    ############################################
-
-    configdict["gaussCons"] = {}
-    # Constraint on DeltaM
-    configdict["gaussCons"]["deltaM"] = math.sqrt(0.0021 * 0.0021 + 0.0010 * 0.0010)  # 0.0023259
-    # Constraint on Gamma (error on gamma = rel. error on lifetime * gamma)
-    configdict["gaussCons"]["Gamma"] = (0.004 / 1.519068) * (1.0 / 1.519068)
-
-    ############################################
-    # Choose parameters to perform the
-    # likelihood scan for
-    ############################################
-
-    #configdict["LikelihoodScan"] = []
-    #configdict["LikelihoodScan"].append("Sf")
-    #configdict["LikelihoodScan"].append("Sfbar")
-
-    ############################################
-    # Choose initial free parameters to randomise
-    ############################################
-
-    #configdict["randomiseParams"] = {}
-    #configdict["randomiseParams"] = {'Sf': {'min': -0.04, 'max': -0.02},
-    #                                 'Sfbar': {'min': 0.02, 'max': 0.04}
-    #                                 }
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnSignalToys.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnSignalToys.py
deleted file mode 100644
index debf3d0366881e5f584c59c6f7cdbe63033522c9..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnSignalToys.py
+++ /dev/null
@@ -1,237 +0,0 @@
-def getconfig() :
-
-    import math
-    from math import pi
-
-    configdict = {}
-
-    configdict["Decay"] = "Bd2DPi"
-
-    ############################################
-    # Define all basic variables
-    ############################################
-
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5090,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersConst_M_flat"}
-
-    #configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1904    ],
-    #                                                 "Name"                   : "CharmMass",
-    #                                                 "InputName"              : "obsMassDminus"}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.4,     15.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_ctau_flat"}
-
-    #configdict["BasicVariables"]["BacP"]          = { "Range"                  : [2000.0,  650000.0],
-    #                                                  "Name"                   : "BacP",
-    #                                                  "InputName"              : "lab0_FitDaughtersConst_P0_P_flat"}
-
-    #configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-    #                                                  "Name"                   : "BacPT",
-    #                                                  "InputName"              : "lab0_FitDaughtersConst_P0_PT_flat"}
-
-    #configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0, 999.0     ],
-    #                                                  "Name"                   : "BacPIDK",
-    #                                                  "InputName"              : "lab1_PIDK"}
-
-    #configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-    #                                                  "Name"                   : "nTracks",
-    #                                                  "InputName"              : "nTracks"}
-
-    #configdict["BasicVariables"]["BeautyTimeErr"] = { "Range"                  : [0.01,    0.1     ],
-    #                                                  "Name"                   : "BeautyTimeErr",
-    #                                                  "InputName"              : "lab0_FitDaughtersPVConst_ctauErr_flat"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_ID"}
-
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecOS",
-                                                      "InputName"              : "lab0_TAGDECISION_OS"}
-
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecSS",
-                                                      "InputName"              : "lab0_SS_PionBDT_DEC"}
-
-    configdict["BasicVariables"]["MistagOS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagOS",
-                                                      "InputName"              : "lab0_TAGOMEGA_OS"}
-
-    configdict["BasicVariables"]["MistagSS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagSS",
-                                                      "InputName"              : "lab0_SS_PionBDT_PROB"}
-
-    configdict["AdditionalVariables"] = {}
-    configdict["AdditionalVariables"]["TrueID"]   = { "Range"                  : [0.0, 1500.0],
-                                                      "InputName"              : "TrueID" }
-
-
-    ############################################
-    # Define all CPV and decay rate parameters
-    ############################################
-
-    #Parameters from https://svnweb.cern.ch/trac/lhcb/browser/DBASE/tags/Gen/DecFiles/v27r42/dkfiles/Bd_D-pi+,Kpipi=CPVDDalitz,DecProdCut.dec)
-    ModqOverp_d     =  1
-    ArgqOverp_d     =  -0.746
-    ModpOverq_d     =  1
-    ArgpOverq_d     =  0.746
-    ModAf_d         =  0.0849
-    ArgAf_d         =  0.002278
-    ModAbarf_d      =  0.00137
-    ArgAbarf_d      =  -1.128958
-    ModAfbar_d      =  0.00137
-    ArgAfbar_d      =  1.3145
-    ModAbarfbar_d   =  0.0849
-    ArgAbarfbar_d   =  0.002278
-
-    configdict["ACP"] = {}
-    configdict["ACP"]["Signal"] = { "Gamma"                : [1.0 / 1.520, 0.1, 2.0], #Inverse lifetime from HFAG (http://www.slac.stanford.edu/xorg/hfag/osc/summer_2016/)
-                                    "DeltaGamma"           : [0.0],
-                                    "DeltaM"               : [0.5064, 0.01, 2.0], #Global average from HFAG (http://www.slac.stanford.edu/xorg/hfag/osc/summer_2016/)
-                                    #"ArgLf"                : [ArgqOverp_d + ArgAbarf_d - ArgAf_d],
-                                    #"ArgLbarfbar"          : [ArgpOverq_d + ArgAfbar_d - ArgAbarfbar_d],
-                                    #"ModLf"                : [ModAbarf_d/ModAf_d],
-                                    "C"                    : [1.0], #we neglect r^2 terms
-                                    "S"                    : [-0.031], #from decfile
-                                    "Sbar"                 : [0.029], #from decfile
-                                    "D"                    : [0], #from DeltaGamma=0
-                                    "Dbar"                 : [0], #from DeltaGamma=0
-                                    "ParameteriseIntegral" : True,
-                                    "CPlimit"              : {"upper":1.0, "lower":-1.0},
-                                    "NBinsAcceptance"      : 0} #keep at zero if using spline acceptance!
-
-    ############################################
-    # Define resolution and acceptance models
-    ############################################
-
-    configdict["ResolutionAcceptance"] = {}
-    configdict["ResolutionAcceptance"]["Signal"] = {}
-    configdict["ResolutionAcceptance"]["Signal"] = {"TimeErrorPDF": None,
-                                                    "Acceptance": #From ANA note v2
-                                                    {"Type": "Spline",
-                                                     "Float": True,
-                                                     "KnotPositions" : [ 0.5, 1.0, 1.5, 2.0, 3.0, 12.0 ],
-                                                     "KnotCoefficients" : [0.3889, 0.5754, 0.8515, 1.0649, 1.2373, 1.4149] },
-                                                    "Resolution": #From ANA note v2
-                                                    {"Type": "AverageModel",
-                                                     "Parameters": { 'sigmas': [ 0.05491 ], 'fractions': [] },
-                                                     "Bias": [0.0],
-                                                     "ScaleFactor": [1.0]}
-                                                    }
-
-    ############################################
-    # Define asymmetries
-    ############################################
-
-    configdict["ProductionAsymmetry"] = {}
-    configdict["DetectionAsymmetry"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = {}
-    configdict["DetectionAsymmetry"]["Signal"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = [-0.0124, -1.0, 1.0] #from ANA note v2
-    configdict["DetectionAsymmetry"]["Signal"] = [0.0086, -1.0, 1.0] #from arXiv:1408.0275v2 (OPPOSITE SIGN!!!)
-
-    ############################################
-    # Define taggers and their calibration
-    ############################################
-
-    configdict["Taggers"] = {}
-    configdict["Taggers"]["Signal"] = {}
-    configdict["Taggers"]["Signal"] = {"OS" : #From Bu, stat and syst combined
-                                       {"Calibration":
-                                        {"p0"       : [0.3737056, 0.01, 0.8],
-                                         "p1"       : [1.028621, 0.3, 1.5],
-                                         "deltap0"  : [0.011819, -0.1, 0.3],
-                                         "deltap1"  : [0.043134, -0.1, 0.3],
-                                         "avgeta"   : [0.347742], #<eta> on spline-corrected Bu->D0Pi
-                                         "tageff"   : [0.371, 0.01, 0.99], #float in the fit
-                                         "tagasymm" : [0.0]
-                                         },
-                                        "MistagPDF" :
-                                        {"Type"     : "BuildTemplate"}
-                                        },
-                                       "SS": #From JpsiKst, stat and syst combined
-                                       {"Calibration":
-                                        {"p0"       : [0.4424049, 0.01, 0.8],
-                                         "p1"       : [0.81302, 0.3, 1.5],
-                                         "deltap0"  : [0.00062332, -0.1, 0.1],
-                                         "deltap1"  : [0.0066248, -0.1, 0.1],
-                                         "avgeta"   : [0.435], #<eta> on Bd->J/psiK*
-                                         "tageff"   : [0.816, 0.01, 0.99], #float in the fit
-                                         "tagasymm" : [0.0]
-                                         },
-                                        "MistagPDF" :
-                                        {"Type"     : "BuildTemplate"}
-                                        }
-                                       }
-
-    ############################################
-    # Choose parameters to fix
-    ############################################
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Cf')
-    configdict["constParams"].append('Cfbar')
-    configdict["constParams"].append('Df')
-    configdict["constParams"].append('Dfbar')
-    configdict["constParams"].append('.*scalefactor')
-    #configdict["constParams"].append('resmodel00_sigma')
-
-    ############################################
-    # Build gaussian constraints
-    # See B2DXFitters/GaussianConstraintBuilder.py for documentation
-    ############################################
-
-    configdict["gaussCons"] = {}
-    # Constraint on resolution
-    configdict["gaussCons"]["resmodel00_sigma"] = 0.00038
-    # Constraint on DeltaM
-    configdict["gaussCons"]["deltaM"] = 0.0019
-    # Constraint on Gamma (error on gamma = rel. error on lifetime * gamma)
-    configdict["gaussCons"]["Gamma"] = (0.004/1.520) * (1.0/1.520)
-    # Multivariate constraint for production and detection asymmetries
-    #configdict["gaussCons"]["multivarAsymm"] = [ ['ProdAsymm', 'DetAsymm'], #parname
-    #                                             [math.sqrt(0.0081*0.0081 + 0.0014*0.0014), 0.0046], #errors
-    #                                             [ [1, -0.65], #correlation matrix
-    #                                               [-0.65, 1] ]
-    #                                             ]
-    # Multivariate constraint for OS combination
-    configdict["gaussCons"]["multivarOSCalib"] = [ ['p0_OS', 'p1_OS', 'deltap0_OS', 'deltap1_OS'], #parname
-                                                    [0.00276866695767, 0.0532951796942, 0.00269475453428, 0.037310097266], #errors
-                                                    [ [1,         0.14218,       -0.017668,       0.0092814],  #correlation matrix from EPM
-                                                      [0.14218,         1,       0.0092814,       -0.048821],
-                                                      [-0.017668, 0.0092814,             1,         0.14218],
-                                                      [0.0092814,  -0.048821,      0.14218,                1] ]
-                                                    ]
-    #Add constraint for SS combination
-    configdict["gaussCons"]["multivarSSCalib"] = [ ['p0_SS', 'p1_SS', 'deltap0_SS', 'deltap1_SS'], #parname
-                                                   [0.007431465, 0.05246453784, 0.004264925, 0.08085860086], #errors
-                                                   [ [1,         -0.054207,       -0.01714,       -0.0048873],  #correlation matrix from EPM
-                                                     [-0.054207,         1,       -0.004997,       -0.0053978],
-                                                     [-0.01714, -0.004997,             1,         -0.071635],
-                                                     [-0.0048873,  -0.0053978,      -0.071635,                1] ]
-                                                   ]
-
-
-    ############################################
-    # Choose parameters to perform the
-    # likelihood scan for
-    ############################################
-
-    configdict["LikelihoodScan"] = []
-    configdict["LikelihoodScan"].append("Sf")
-    configdict["LikelihoodScan"].append("Sfbar")
-
-    ############################################
-    # Choose initial free parameters to randomise
-    ############################################
-
-    configdict["randomiseParams"] = {}
-    configdict["randomiseParams"] = {'Sf'                          : {'min': -0.04,   'max': -0.02},
-                                     'Sfbar'                       : {'min': 0.02, 'max': 0.04}
-                                     }
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnToys.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnToys.py
deleted file mode 100644
index c6c0132db365a9266be6abe24c4df1bcef0a5f8d..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnToys.py
+++ /dev/null
@@ -1,208 +0,0 @@
-def getconfig() :
-
-    import math
-    from math import pi
-
-    configdict = {}
-
-    configdict["Decay"] = "Bd2DPi"
-
-    ############################################
-    # Define all basic variables
-    ############################################
-
-    configdict["BasicVariables"] = {}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.4,     12.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_ctau_flat"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_ID"}
-
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecOS",
-                                                      "InputName"              : "lab0_TAGDECISION_OS"}
-
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecSS",
-                                                      "InputName"              : "lab0_SS_PionBDT_DEC"}
-
-    configdict["BasicVariables"]["MistagOS"]      = { "Range"                  : [ 0.0,  0.5 ],
-                                                      "Name"                   : "MistagOS",
-                                                      "InputName"              : "lab0_TAGOMEGA_OS"}
-
-    configdict["BasicVariables"]["MistagSS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagSS",
-                                                      "InputName"              : "lab0_SS_PionBDT_PROB"}
-
-    ############################################
-    # Define all CPV and decay rate parameters
-    ############################################
-
-    #Parameters from https://svnweb.cern.ch/trac/lhcb/browser/DBASE/tags/Gen/DecFiles/v27r42/dkfiles/Bd_D-pi+,Kpipi=CPVDDalitz,DecProdCut.dec)
-    ModqOverp_d     =  1
-    ArgqOverp_d     =  -0.746
-    ModpOverq_d     =  1
-    ArgpOverq_d     =  0.746
-    ModAf_d         =  0.0849
-    ArgAf_d         =  0.002278
-    ModAbarf_d      =  0.00137
-    ArgAbarf_d      =  -1.128958
-    ModAfbar_d      =  0.00137
-    ArgAfbar_d      =  1.3145
-    ModAbarfbar_d   =  0.0849
-    ArgAbarfbar_d   =  0.002278
-
-    configdict["ACP"] = {}
-    configdict["ACP"]["Signal"] = { "Gamma"                : [1.0/1.518, 0.0, 2.0],
-                                    "DeltaGamma"           : [0.0],
-                                    "DeltaM"               : [0.5050, 0.01, 2.0],#[0.510, 0.01, 2.0],#[0.5050, 0.01, 2.0], #Global average from HFAG (http://www.slac.stanford.edu/xorg/hfag/osc/summer_2016/)
-                                    #"ArgLf"                : [ArgqOverp_d + ArgAbarf_d - ArgAf_d],
-                                    #"ArgLbarfbar"          : [ArgpOverq_d + ArgAfbar_d - ArgAbarfbar_d],
-                                    #"ModLf"                : [ModAbarf_d/ModAf_d],
-                                    "C"                    : [1.0], #we neglect r^2 terms
-                                    "S"                    : [-0.031], #from decfile
-                                    "Sbar"                 : [-0.029], #from decfile
-                                    "D"                    : [0.0], #from DeltaGamma=0
-                                    "Dbar"                 : [0.0], #from DeltaGamma=0
-                                    "ParameteriseIntegral" : True,
-                                    "CPlimit"              : {"upper":1.0, "lower":-1.0},
-                                    "NBinsAcceptance"      : 0} #keep at zero if using spline acceptance!
-
-    ############################################
-    # Define resolution and acceptance models
-    ############################################
-
-    configdict["ResolutionAcceptance"] = {}
-    configdict["ResolutionAcceptance"]["Signal"] = {}
-    configdict["ResolutionAcceptance"]["Signal"] = {"TimeErrorPDF": None,
-                                                    "Acceptance": #From ANA note v2
-                                                    {"Type": "Spline",
-                                                     "Float": True,
-                                                     "Extrapolate": True,
-                                                     "KnotPositions" : [0.5, 1.0, 1.5, 2.0, 2.3, 2.6, 3.0, 4.0, 10.0],
-                                                     "KnotCoefficients" : [1.9440e-01, 3.3275e-01, 6.1444e-01, 8.6628e-01, 9.9600e-01, 1.0745e+00, 1.1083e+00, 1.1565e+00, 1.1946e+00]},
-                                                    "Resolution": #From ANA note v2
-                                                    {"Type": "AverageModel",
-                                                     "Parameters": { 'sigmas': [ 0.05491 ], 'fractions': [] },
-                                                     "Bias": [0.0],
-                                                     "ScaleFactor": [1.0]}
-                                                    }
-
-    ############################################
-    # Define asymmetries
-    ############################################
-
-    configdict["ProductionAsymmetry"] = {}
-    configdict["DetectionAsymmetry"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = {}
-    configdict["DetectionAsymmetry"]["Signal"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = [-0.00638385, -1.0, 1.0]#fitted on data #[0.0] #[-0.0124, -1.0, 1.0] #from ANA note v2
-    configdict["DetectionAsymmetry"]["Signal"] = [0.0086, -1.0, 1.0]#fitted on data #[0.0086, -1.0, 1.0] #from arXiv:1408.0275v2 (OPPOSITE SIGN!!!)
-
-    ############################################
-    # Define taggers and their calibration
-    ############################################
-
-    configdict["Taggers"] = {}
-    configdict["Taggers"]["Signal"] = {}
-    configdict["Taggers"]["Signal"] = {"OS" :
-                                       {"Calibration":
-                                        { "Type" : "Linear",
-                                          "p0"  : [0.37, 0.0, 5.0],
-                                          "p1"  : [0.8, 0.0, 5.0],
-                                          "deltap0" : [0.0017216, -2.0, 2.0],
-                                          "deltap1" : [0.051919, -2.0, 2.0],
-                                          "avgeta" : [0.37],
-                                          "tageff"   : [0.4, 0.0, 1.0],
-                                          "tagasymm" : [0.0]
-                                          },
-                                        "MistagPDF" :
-                                        {"Type"     : "BuildTemplate"}
-                                        },
-                                       "SS" :
-                                       {"Calibration":
-                                        { "Type" : "Linear",
-                                          "p0"  : [0.4, 0.0, 5.0],
-                                          "p1"  : [0.8, 0.0, 5.0],
-                                          "deltap0" : [0.0017216, -2.0, 2.0],
-                                          "deltap1" : [0.051919, -2.0, 2.0],
-                                          "avgeta" : [0.4],
-                                          "tageff"   : [0.9, 0.0, 1.0],
-                                          "tagasymm" : [0.0]
-                                          },
-                                        "MistagPDF" :
-                                        {"Type"     : "BuildTemplate"}
-                                        }
-                                       }
-    #configdict["Taggers"]["Signal"] = {"OS" :
-    #                                   {"Calibration":
-    #                                    { "Type": "GLM",
-    #                                      "XML": ["/eos/lhcb/wg/b2oc/TD_DPi_3fb/calibrations/RLogisticCalibration_Bu2D0Pi_OS_20171109.xml"],
-    #                                      "tageff"   : [0.432389, 0.0, 1.0],
-    #                                      "tagasymm" : [0.0]
-    #                                      },
-    #                                    "MistagPDF" :
-    #                                    {"Type"     : "BuildTemplate"}
-    #                                    },
-    #                                   "SS":
-    #                                   {"Calibration":
-    #                                    { "Type": "GLM",
-    #                                      "XML": ["/eos/lhcb/wg/b2oc/TD_DPi_3fb/calibrations/RLogisticCalibration_Bd2JpsiKst_SS_20171101.xml"],
-    #                                      "tageff"   : [0.930458, 0.0, 1.0],
-    #                                      "tagasymm" : [0.0]
-    #                                      },
-    #                                    "MistagPDF" :
-    #                                    {"Type"     : "BuildTemplate"}
-    #                                    }
-    #                                   }
-    
-    ############################################
-    # Choose parameters to fix
-    ############################################
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Cf')
-    configdict["constParams"].append('Cfbar')
-    configdict["constParams"].append('Df')
-    configdict["constParams"].append('Dfbar')
-    configdict["constParams"].append('.*scalefactor')
-    configdict["constParams"].append('resmodel00_sigma')
-
-    ############################################
-    # Build gaussian constraints
-    # See B2DXFitters/GaussianConstraintBuilder.py for documentation
-    ############################################
-
-    configdict["gaussCons"] = {}
-    # Constraint on resolution
-    # Constraint on DeltaM
-    configdict["gaussCons"]["deltaM"] = math.sqrt(0.0021*0.0021 + 0.0010*0.0010)
-    # Constraint on Gamma (error on gamma = rel. error on lifetime * gamma)
-    configdict["gaussCons"]["Gamma"] = (0.004/1.518) * (1.0/1.518)
-
-    ############################################
-    # Choose parameters to perform the
-    # likelihood scan for
-    ############################################
-
-    configdict["LikelihoodScan"] = []
-    configdict["LikelihoodScan"].append("Sf")
-    configdict["LikelihoodScan"].append("Sfbar")
-
-    ############################################
-    # Choose initial free parameters to randomise
-    ############################################
-
-    configdict["randomiseParams"] = {}
-    configdict["randomiseParams"] = {'Sf'                          : {'min': -0.5,   'max': -0.0001},
-                                     'Sfbar'                       : {'min': -0.5, 'max': -0.0001},
-                                     #'Cf'                          : {'min': 0.1,   'max': 1.0},
-                                     'ProdAsymm'                   : {'min': -0.5,   'max': -0.0001},
-                                     'DetAsymm'                    : {'min': 0.0001,   'max': 0.5}
-                                     }
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnToys_Alex.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnToys_Alex.py
deleted file mode 100644
index 5b9963ff9e4e0e7a4cdccf64a36cfeb2fd22fc11..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnToys_Alex.py
+++ /dev/null
@@ -1,248 +0,0 @@
-def getconfig() :
-
-    import math
-    from math import pi
-
-    configdict = {}
-
-    configdict["Decay"] = "Bd2DPi"
-
-    ############################################
-    # Define all basic variables
-    ############################################
-
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5090,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersConst_M_flat"}
-
-    #configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1904    ],
-    #                                                 "Name"                   : "CharmMass",
-    #                                                 "InputName"              : "obsMassDminus"}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.4,     15.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_ctau_flat"}
-
-    #configdict["BasicVariables"]["BacP"]          = { "Range"                  : [2000.0,  650000.0],
-    #                                                  "Name"                   : "BacP",
-    #                                                  "InputName"              : "lab0_FitDaughtersConst_P0_P_flat"}
-
-    #configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-    #                                                  "Name"                   : "BacPT",
-    #                                                  "InputName"              : "lab0_FitDaughtersConst_P0_PT_flat"}
-
-    #configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0, 999.0     ],
-    #                                                  "Name"                   : "BacPIDK",
-    #                                                  "InputName"              : "lab1_PIDK"}
-
-    #configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-    #                                                  "Name"                   : "nTracks",
-    #                                                  "InputName"              : "nTracks"}
-
-    #configdict["BasicVariables"]["BeautyTimeErr"] = { "Range"                  : [0.01,    0.1     ],
-    #                                                  "Name"                   : "BeautyTimeErr",
-    #                                                  "InputName"              : "lab0_FitDaughtersPVConst_ctauErr_flat"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_ID"}
-
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecOS",
-                                                      "InputName"              : "lab0_TAGDECISION_OS"}
-
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecSS",
-                                                      "InputName"              : "lab0_SS_PionBDT_DEC"}
-
-    configdict["BasicVariables"]["MistagOS"]      = { "Range"                  : [ 0.0,    0.48     ],
-                                                      "Name"                   : "MistagOS",
-                                                      "InputName"              : "lab0_TAGOMEGA_OS"}
-
-    configdict["BasicVariables"]["MistagSS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagSS",
-                                                      "InputName"              : "lab0_SS_PionBDT_PROB"}
-
-    configdict["AdditionalVariables"] = {}
-    configdict["AdditionalVariables"]["TrueID"]   = { "Range"                  : [0.0, 1500.0],
-                                                      "InputName"              : "TrueID" }
-
-
-    ############################################
-    # Define all CPV and decay rate parameters
-    ############################################
-
-    #Parameters from https://svnweb.cern.ch/trac/lhcb/browser/DBASE/tags/Gen/DecFiles/v27r42/dkfiles/Bd_D-pi+,Kpipi=CPVDDalitz,DecProdCut.dec)
-    ModqOverp_d     =  1
-    ArgqOverp_d     =  -0.746
-    ModpOverq_d     =  1
-    ArgpOverq_d     =  0.746
-    ModAf_d         =  0.0849
-    ArgAf_d         =  0.002278
-    ModAbarf_d      =  0.00137
-    ArgAbarf_d      =  -1.128958
-    ModAfbar_d      =  0.00137
-    ArgAfbar_d      =  1.3145
-    ModAbarfbar_d   =  0.0849
-    ArgAbarfbar_d   =  0.002278
-
-    configdict["ACP"] = {}
-    configdict["ACP"]["Signal"] = { "Gamma"                : [1.0 / 1.520, 0.1, 2.0], #Inverse lifetime from HFAG (http://www.slac.stanford.edu/xorg/hfag/osc/summer_2016/)
-                                    "DeltaGamma"           : [0.0],
-                                    "DeltaM"               : [0.5050, 0.01, 2.0], #Global average from HFAG (http://www.slac.stanford.edu/xorg/hfag/osc/summer_2016/)
-                                    #"ArgLf"                : [ArgqOverp_d + ArgAbarf_d - ArgAf_d],
-                                    #"ArgLbarfbar"          : [ArgpOverq_d + ArgAfbar_d - ArgAbarfbar_d],
-                                    #"ModLf"                : [ModAbarf_d/ModAf_d],
-                                    "C"                    : [1.0], #we neglect r^2 terms
-                                    "S"                    : [-0.031], #from decfile
-                                    "Sbar"                 : [0.029], #from decfile
-                                    "D"                    : [0], #from DeltaGamma=0
-                                    "Dbar"                 : [0], #from DeltaGamma=0
-                                    "ParameteriseIntegral" : True,
-                                    "CPlimit"              : {"upper":1.0, "lower":-1.0},
-                                    "NBinsAcceptance"      : 0} #keep at zero if using spline acceptance!
-
-    ############################################
-    # Define resolution and acceptance models
-    ############################################
-
-    configdict["ResolutionAcceptance"] = {}
-    configdict["ResolutionAcceptance"]["Signal"] = {}
-    configdict["ResolutionAcceptance"]["Signal"] = {"TimeErrorPDF": None,
-                                                    "Acceptance": #From ANA note v2
-                                                    {"Type": "Spline",
-                                                     "Float": True,
-                                                     "KnotPositions" : [ 0.5, 1.0, 1.5, 2.0, 3.0, 12.0 ],
-                                                     "KnotCoefficients" : [0.3889, 0.5754, 0.8515, 1.0649, 1.2373, 1.4149] },
-                                                    "Resolution": #From ANA note v2
-                                                    {"Type": "AverageModel",
-                                                     "Parameters": { 'sigmas': [ 0.05491 ], 'fractions': [] },
-                                                     "Bias": [0.0],
-                                                     "ScaleFactor": [1.0]}
-                                                    }
-
-    ############################################
-    # Define asymmetries
-    ############################################
-
-    configdict["ProductionAsymmetry"] = {}
-    configdict["DetectionAsymmetry"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = {}
-    configdict["DetectionAsymmetry"]["Signal"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = [-0.0124, -1.0, 1.0] #from ANA note v2
-    configdict["DetectionAsymmetry"]["Signal"] = [0.0086, -1.0, 1.0] #from arXiv:1408.0275v2 (OPPOSITE SIGN!!!)
-
-    ############################################
-    # Define taggers and their calibration
-    ############################################
-
-    configdict["Taggers"] = {}
-    configdict["Taggers"]["Signal"] = {}
-    configdict["Taggers"]["Signal"] = {"OS" : #From Bu, stat and syst combined
-                                       {"Calibration":
-                                        {"p0"       : [0.3737056, 0.01, 0.8],
-                                         "p1"       : [1.028621, 0.3, 1.5],
-                                         "deltap0"  : [0.011819, -0.1, 0.3],
-                                         "deltap1"  : [0.043134, -0.1, 0.3],
-                                         "avgeta"   : [0.347742], #this is the mean of the RooHistPDF used in generation
-                                         "tageff"   : [0.371, 0.01, 0.99], #float in the fit
-                                         "tagasymm" : [0.0]
-                                         },
-                                        "MistagPDF" :
-                                        {"Type"     : "BuildTemplate"}
-                                        },
-                                       "SS": #From JpsiKst, stat and syst combined
-                                       {"Calibration":
-                                        {"p0"       : [0.4424049, 0.01, 0.8],
-                                         "p1"       : [0.81302, 0.3, 1.5],
-                                         "deltap0"  : [0.00062332, -0.1, 0.1],
-                                         "deltap1"  : [0.0066248, -0.1, 0.1],
-                                         "avgeta"   : [0.435], #this is the mean of the RooHistPDF used in generation
-                                         "tageff"   : [0.816, 0.01, 0.99], #float in the fit
-                                         "tagasymm" : [0.0]
-                                         },
-                                        "MistagPDF" :
-                                        {"Type"     : "BuildTemplate"}
-                                        }
-                                       }
-
-    ############################################
-    # Choose parameters to fix
-    ############################################
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Cf')
-    configdict["constParams"].append('Cfbar')
-    configdict["constParams"].append('Df')
-    configdict["constParams"].append('Dfbar')
-    configdict["constParams"].append('.*scalefactor')
-
-    # configdict["constParams"].append('p0_OS')
-    # configdict["constParams"].append('p1_OS')
-    # configdict["constParams"].append('deltap0_OS')
-    # configdict["constParams"].append('deltap1_OS')
-
-    # configdict["constParams"].append('p0_SS')
-    # configdict["constParams"].append('p1_SS')
-    # configdict["constParams"].append('deltap0_SS')
-    # configdict["constParams"].append('deltap1_SS')
-
-    configdict["constParams"].append('resmodel00_sigma')
-
-    ############################################
-    # Build gaussian constraints
-    # See B2DXFitters/GaussianConstraintBuilder.py for documentation
-    ############################################
-
-    configdict["gaussCons"] = {}
-    # Constraint on DeltaM
-    configdict["gaussCons"]["deltaM"] = math.sqrt(0.0021*0.0021 + 0.0010*0.0010)
-    # Constraint on Gamma (error on gamma = rel. error on lifetime * gamma)
-    configdict["gaussCons"]["Gamma"] = (0.004/1.520) * (1.0/1.520)
-    # Constraint on resolution sigma
-    # configdict["gaussCons"]["resmodel00_sigma"] = 0.00038
-    # Multivariate constraint for production and detection asymmetries
-    # configdict["gaussCons"]["multivarAsymm"] = [ ['ProdAsymm', 'DetAsymm'], #parname
-    #                                              [math.sqrt(0.0081*0.0081 + 0.0014*0.0014), 0.0046], #errors
-    #                                              [ [1, -0.65], #correlation matrix
-    #                                                [-0.65, 1] ]
-    #                                              ]
-    # Multivariate constraint for OS combination
-    configdict["gaussCons"]["multivarOSCalib"] = [ ['p0_OS', 'p1_OS', 'deltap0_OS', 'deltap1_OS'], #parname
-                                                    [0.00276866695767, 0.0532951796942, 0.00269475453428, 0.037310097266], #errors
-                                                    [ [1,         0.14218,       -0.017668,       0.0092814],  #correlation matrix from EPM
-                                                      [0.14218,         1,       0.0092814,       -0.048821],
-                                                      [-0.017668, 0.0092814,             1,         0.14218],
-                                                      [0.0092814,  -0.048821,      0.14218,                1] ]
-                                                    ]
-    #Add constraint for SS combination
-    configdict["gaussCons"]["multivarSSCalib"] = [ ['p0_SS', 'p1_SS', 'deltap0_SS', 'deltap1_SS'], #parname
-                                                   [0.007431465, 0.05246453784, 0.004264925, 0.08085860086], #errors
-                                                   [ [1,         -0.054207,       -0.01714,       -0.0048873],  #correlation matrix from EPM
-                                                     [-0.054207,         1,       -0.004997,       -0.0053978],
-                                                     [-0.01714, -0.004997,             1,         -0.071635],
-                                                     [-0.0048873,  -0.0053978,      -0.071635,                1] ]
-                                                   ]
-
-
-    ############################################
-    # Choose parameters to perform the
-    # likelihood scan for
-    ############################################
-
-    configdict["LikelihoodScan"] = []
-    configdict["LikelihoodScan"].append("Sf")
-    configdict["LikelihoodScan"].append("Sfbar")
-
-    ############################################
-    # Choose initial free parameters to randomise
-    ############################################
-
-    configdict["randomiseParams"] = {}
-    configdict["randomiseParams"] = {'Sf'                          : {'min': -0.04,   'max': -0.02},
-                                     'Sfbar'                       : {'min': 0.02, 'max': 0.04}
-                                     }
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnToys_SignalOnly.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnToys_SignalOnly.py
deleted file mode 100644
index a2481656bb7da63c8efccea737ad06e74d0d7bc4..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSFitOnToys_SignalOnly.py
+++ /dev/null
@@ -1,216 +0,0 @@
-"""configuration file for decaytime fit on signal only toys"""
-from __future__ import division
-from past.utils import old_div
-def getconfig():
-
-    import math
-    from math import pi
-
-    configdict = {}
-
-    configdict["Decay"] = "Bd2DPi"
-
-    ############################################
-    # Define all basic variables
-    ############################################
-
-    configdict["BasicVariables"] = {}
-
-    configdict["BasicVariables"]["BeautyTime"]    = {"Range": [0.4, 12.0],
-                                                     "Bins": 40,
-                                                     "Name": "BeautyTime",  # the name is not used by the MDFitterSettings/Translator etc.
-                                                     "InputName": "BeautyTime"}
-    # if one wants to cut on the dataset the easiest way is to add a preselection in addition to the range defined here (preselection added
-    # by option --preselection on command line)
-
-    configdict["BasicVariables"]["BacCharge"]     = {"Range": [-1000.0, 1000.0],
-                                                     "Name": "BacCharge",
-                                                     "InputName": "BacCharge"}
-
-    configdict["BasicVariables"]["TagDecOS"]      = {"Range": [-1.0, 1.0],
-                                                     "Name": "TagDecOS",
-                                                     "InputName": "TagDecOS"}
-
-    configdict["BasicVariables"]["TagDecSS"]      = {"Range": [-1.0, 1.0],
-                                                     "Name": "TagDecSS",
-                                                     "InputName": "TagDecSS"}  # available via mdSet->GetTagVar(i)
-    # the original specifier is available via mdSet->GetTagVarOutName(i)
-    # this name + "_idx" is used in the inputtree/dataset - so no flexibility in the beginning of the name as "TagDec" is used when checking for
-    # tagging variables in general at the beginning
-
-    configdict["BasicVariables"]["MistagOS"]      = {"Range": [0.0736165, 0.499999],  # 0.4619
-                                                     "Name": "MistagOS",
-                                                     "InputName": "MistagOS"}
-
-    configdict["BasicVariables"]["MistagSS"]      = {"Range": [0.0171234, 0.5],  # 0.492
-                                                     "Name": "MistagSS",
-                                                     "InputName": "MistagSS"}
-
-    configdict["AdditionalVariables"] = {}
-    #configdict["AdditionalVariables"]["TrueID"]   = {"Range": [0.0, 1500.0],
-    #                                                 "InputName": "TrueID"}
-
-    ############################################
-    # Define all CPV and decay rate parameters
-    ############################################
-
-    # Parameters from https://svnweb.cern.ch/trac/lhcb/browser/DBASE/tags/Gen/DecFiles/v27r42/dkfiles/Bd_D-pi+,Kpipi=CPVDDalitz,DecProdCut.dec)
-    ModqOverp_d     = 1
-    ArgqOverp_d     = -0.746
-    ModpOverq_d     = 1
-    ArgpOverq_d     = 0.746
-    ModAf_d         = 0.0849
-    ArgAf_d         = 0.002278
-    ModAbarf_d      = 0.00137
-    ArgAbarf_d      = -1.128958
-    ModAfbar_d      = 0.00137
-    ArgAfbar_d      = 1.3145
-    ModAbarfbar_d   = 0.0849
-    ArgAbarfbar_d   = 0.002278
-
-    configdict["ACP"] = {}
-    configdict["ACP"]["Signal"] = {"Gamma": [1.0 / 1.520, 0.1, 2.0],  # Inverse lifetime from HFAG (http://www.slac.stanford.edu/xorg/hfag/osc/summer_2016/)
-                                   "DeltaGamma": [0.0],
-                                   "DeltaM": [0.5050, 0.01, 5.0],  # Global average from HFAG (http://www.slac.stanford.edu/xorg/hfag/osc/summer_2016/)
-                                   "ArgLf": [ArgqOverp_d + ArgAbarf_d - ArgAf_d],
-                                   "ArgLbarfbar": [ArgpOverq_d + ArgAfbar_d - ArgAbarfbar_d],
-                                   "ModLf": [old_div(ModAbarf_d, ModAf_d)],
-                                   # "C": [0.0],  # sin2beta
-                                   # "S": [0.7],  # sin2beta
-                                   # "Sbar": [0.0],  # sin2beta
-                                   # "C": [1.0],  # we neglect r^2 terms
-                                   # "S": [-0.031],  # from decfile
-                                   # "Sbar": [0.029],  # from decfile
-                                   #"D": [0],  # from DeltaGamma=0
-                                   #"Dbar": [0],  # from DeltaGamma=0
-                                   "ParameteriseIntegral": True,
-                                   "CPlimit": {"upper": 2.0, "lower": -2.0},
-                                   "NBinsAcceptance": 0}  # keep at zero if using spline acceptance!
-
-    ############################################
-    # Define resolution and acceptance models
-    ############################################
-
-    configdict["ResolutionAcceptance"] = {}
-    configdict["ResolutionAcceptance"]["Signal"] = {}
-    configdict["ResolutionAcceptance"]["Signal"] = {"TimeErrorPDF": None,
-                                                    "Acceptance":  # From ANA note v2
-                                                    {"Type": "Spline",
-                                                     "Float": True,
-                                                     "KnotPositions": [0.5, 1.0, 1.5, 2.0, 2.3, 2.6, 3.0, 4.0, 10.0],
-                                                     "KnotCoefficients": [1.9440e-01, 3.3275e-01, 6.1444e-01, 8.6628e-01, 9.9600e-01, 1.0745e+00, 1.1083e+00,  1.1565e+00, 1.1946e+00]},
-                                                    "Resolution":  # From ANA note v2
-                                                    {"Type": "AverageModel",
-                                                     "Parameters": {'sigmas': [0.05491], 'fractions': []},
-                                                     "Bias": [0.0],
-                                                     "ScaleFactor": [1.0]}
-                                                    }
-
-    ############################################
-    # Define asymmetries
-    ############################################
-
-    configdict["ProductionAsymmetry"] = {}
-    configdict["DetectionAsymmetry"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = {}
-    configdict["DetectionAsymmetry"]["Signal"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = [-0.0124, -1.0, 1.0]  # from ANA note v2
-    configdict["DetectionAsymmetry"]["Signal"] = [0.0086, -1.0, 1.0]  # from arXiv:1408.0275v2 (OPPOSITE SIGN!!!)
-    # configdict["DetectionAsymmetry"]["Signal"] = [0.0, -1.5, 1.5]  # sin2beta
-
-    ############################################
-    # Define taggers and their calibration
-    ############################################
-
-    configdict["Taggers"] = {}
-    configdict["Taggers"]["Signal"] = {}
-    configdict["Taggers"]["Signal"] = {"OS":  # From Bu, stat and syst combined
-                                       {"Calibration":
-                                        {"Type": "GLM",
-                                         "XML": ["/afs/cern.ch/user/v/vibattis/cmtuser/UraniaDev_v6r2p1/PhysFit/B2DXFitters/tutorial/OS_Combination_Calibration_NSpline_RLogitLink.xml"],
-                                         "tageff": [0.371, 0.01, 0.99],  # float in the fit
-                                         "tagasymm": [0.0]
-                                         },
-                                        "MistagPDF":
-                                        {"Type": "BuildTemplate"}
-                                        },
-                                       "SS":  # From JpsiKst, stat and syst combined
-                                       {"Calibration":
-                                        {"Type": "GLM",
-                                         "XML": ["/afs/cern.ch/user/v/vibattis/cmtuser/UraniaDev_v6r2p1/PhysFit/B2DXFitters/tutorial/SS_PionBDT_Calibration_Poly_LogitLink.xml"],
-                                         "tageff": [0.77, 0.01, 0.99],  # float in the fit
-                                         "tagasymm": [0.0]
-                                         },
-                                        "MistagPDF":
-                                        {"Type": "BuildTemplate"}
-                                        }
-                                       }
-
-    ############################################
-    # Choose parameters to fix
-    ############################################
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Cf')
-    configdict["constParams"].append('Cfbar')
-    #configdict["constParams"].append('Sf')
-    #configdict["constParams"].append('Sfbar')
-    configdict["constParams"].append('Df')
-    configdict["constParams"].append('Dfbar')
-    configdict["constParams"].append('.*scalefactor')
-
-    configdict["constParams"].append('resmodel00_sigma')
-
-    ############################################
-    # Build gaussian constraints
-    # See B2DXFitters/GaussianConstraintBuilder.py for documentation
-    ############################################
-
-    configdict["gaussCons"] = {}
-    # Constraint on DeltaM
-    configdict["gaussCons"]["deltaM"] = math.sqrt(0.0021 * 0.0021 + 0.0010 * 0.0010)  # 0.0023259
-    # Constraint on Gamma (error on gamma = rel. error on lifetime * gamma)
-    configdict["gaussCons"]["Gamma"] = (0.004 / 1.520) * (1.0 / 1.520)  # 0.0017313
-    # Multivariate constraint for OS combination
-    ospedix='_OS_Combination_Calibration_NSpline_RLogitLink'
-    configdict["gaussCons"]["multivarOSCalib"] = [['p_0'+ospedix, 'p_1'+ospedix, 'p_2'+ospedix, 'p_3'+ospedix, 'p_4'+ospedix,
-                                                   'dp_0'+ospedix, 'dp_1'+ospedix, 'dp_2'+ospedix, 'dp_3'+ospedix, 'dp_4'+ospedix],  # parname
-                                                  [0.019695,0.021343,0.0074792,0.1171,0.79469,0.03939,0.042687,0.014958,0.2342,1.5894],  # errors
-                                                  [[1, -0.21732, -0.07802, 0.086702, 0.035155, 0.074186, -0.076022, 0.0067162, 0.032523, 0.0075709],  # correlation matrix from EPM
-                                                   [-0.21732, 1, -0.18847, -0.25706, -0.012079, -0.076022, 0.089704, -0.067287, -0.027743, 0.027762],
-                                                   [-0.07802, -0.18847, 1, -0.092168, -0.37105, 0.0067162, -0.067287, 0.10788, -0.018591, -0.061417],
-                                                   [0.086702, -0.25706, -0.092168, 1, 0.15012, 0.032523, -0.027743, -0.018591, 0.081919, 0.053567],
-                                                   [0.035155, -0.012079, -0.37105, 0.15012, 1, 0.0075709, 0.027762, -0.061417, 0.053567, 0.082966],
-                                                   [0.074186, -0.076022, 0.0067162, 0.032523, 0.0075709, 1, -0.21732, -0.07802, 0.086702, 0.035155],
-                                                   [-0.076022, 0.089704, -0.067287, -0.027743, 0.027762, -0.21732, 1, -0.18847, -0.25706, -0.012079],
-                                                   [0.0067162, -0.067287, 0.10788, -0.018591, -0.061417, -0.07802, -0.18847, 1, -0.092168, -0.3710],
-                                                   [0.032523, -0.027743, -0.018591, 0.081919, 0.053567, 0.086702, -0.25706, -0.092168, 1, 0.15012],
-                                                   [0.0075709, 0.027762, -0.061417, 0.053567, 0.082966, 0.035155, -0.012079, -0.3710, 0.15012, 1]]]
-    # Multivariate constraint for SS combination
-    sspedix='_SS_PionBDT_Calibration_Poly_LogitLink'
-    configdict["gaussCons"]["multivarSSCalib"] = [['p_0'+sspedix, 'p_1'+sspedix, 'dp_0'+sspedix, 'dp_1'+sspedix],  # parname
-                                                  [0.0018216, 0.0062959, 0.0036432, 0.012592],  # errors
-                                                  [[1,       -0.037697,       -0.016192,      0.00080237],  # correlation matrix from EPM
-                                                   [-0.037697,        1,      0.00080237,       -0.011958],
-                                                   [-0.016192,        0.00080237,      1,       -0.037697],
-                                                   [0.00080237,       -0.011958,  -0.037697,    1]]]
-
-    ############################################
-    # Choose parameters to perform the
-    # likelihood scan for
-    ############################################
-
-    #configdict["LikelihoodScan"] = []
-    #configdict["LikelihoodScan"].append("Sf")
-    #configdict["LikelihoodScan"].append("Sfbar")
-
-    ############################################
-    # Choose initial free parameters to randomise
-    ############################################
-
-    #configdict["randomiseParams"] = {}
-    #configdict["randomiseParams"] = {'Sf': {'min': -0.04, 'max': -0.02},
-    #                                 'Sfbar': {'min': 0.02, 'max': 0.04}
-    #                                 }
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSignalToysGeneration.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSignalToysGeneration.py
deleted file mode 100644
index 5fb5932e7f23c1eac30b3f097000fd64817f3c51..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForSignalToysGeneration.py
+++ /dev/null
@@ -1,370 +0,0 @@
-from __future__ import division
-from past.utils import old_div
-def getconfig() :
-
-    configdict = {}
-
-    ############################################################
-    #List of observables for all the PDFs.
-    #The content of this dictionary determines the observables
-    #to generate for and how may taggers are present.
-    ############################################################
-
-    configdict["Observables"] = {}
-    configdict["Observables"] = {"BeautyMass":    {"Type"  : "RooRealVar",
-                                                   "Title" : "B mass (MeV/c^2)",
-                                                   "Range" : [5090, 6000]},
-                                 "BeautyTime":    {"Type" : "RooRealVar",
-                                                   "Title" : "B decay time (ps)",
-                                                   "Range" : [0.4, 15.0]},
-                                 #"BeautyTimeErr": {"Type" : "RooRealVar",
-                                 #                  "Title" : "B decay time error (ps)",
-                                 #                  "Range" : [0.01, 0.1]},
-                                 "BacCharge":     {"Type"  : "RooCategory",
-                                                   "Title" : "Bachelor charge",
-                                                   "Categories": { "h+" : +1,
-                                                                   "h-" : -1}},
-                                 "MistagOS":      {"Type" : "RooRealVar",
-                                                   "Title" : "#eta_{OS}",
-                                                   "Range" : [0.0,0.5]},
-                                 "MistagSS":      {"Type" : "RooRealVar",
-                                                   "Title" : "#eta_{SS}",
-                                                   "Range" : [0.0,0.5]},
-                                 "TrueID":        {"Type" : "RooRealVar",
-                                                   "Title" : "True component ID",
-                                                   "Range" : [0.0,1500.0]},
-                                 "TagDecOS":      {"Type"  : "RooCategory",
-                                                   "Title" : "q_{t}^{OS}",
-                                                   "Categories": { "B+"       : +1,
-                                                                   "Untagged" : 0,
-                                                                   "B-"       : -1}},
-                                 "TagDecSS":      {"Type"  : "RooCategory",
-                                                   "Title" : "q_{t}^{SS}",
-                                                   "Categories": { "B+"       : +1,
-                                                                   "Untagged" : 0,
-                                                                   "B-"       : -1}}
-                                 }
-
-    ############################################################
-    #List of mass hypotheses for bachelor
-    #The content of this dictionary determines how many
-    #bachelor PID bins the final dataset is splitted into
-    ############################################################
-
-    configdict["Hypothesys"] = ["Bd2DPi"]
-
-    ############################################################
-    #Signal decay and Charm decay mode
-    ############################################################
-
-    configdict["Decay"] = "Bd2DPi"
-    configdict["CharmModes"] = ["KPiPi"]
-    configdict["Years"] = ["2011","2012"]
-    configdict["MergedYears"] = True
-
-    ############################################################
-    #Luminosity for splitting yields and other parameters
-    ############################################################
-
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.50, "Up": 0.50}, "2012":{"Down": 1.000, "Up": 1.000}}
-    lum2011 =  configdict["IntegratedLuminosity"]["2011"]["Up"] + configdict["IntegratedLuminosity"]["2011"]["Down"]
-    lum2012 =  configdict["IntegratedLuminosity"]["2012"]["Up"] + configdict["IntegratedLuminosity"]["2012"]["Down"]
-    fracRun1 = old_div(lum2011,(lum2011 + lum2012))
-    DRho_to_DKst_KHypo = 8.5000e-01
-    eff_Bd2DK_DK = 6.29009e-01
-    eff_Bd2DPi_DPi = 9.78927e-01
-
-    ############################################################
-    #List of components with yields to generate.
-    #The content of this dictionary determines, for each
-    #PID bin, how many PDF components are generated.
-    #If there is only signal, a TTree ready for sFit is
-    #generated directly, without need for doing a (useless)
-    #mass fit.
-    ############################################################
-
-    configdict["Components"] = {}
-    configdict["Components"] = {"Signal"        : {"Bd2DPi": {"2011" : {"KPiPi": [5.2848e+05*fracRun1] },
-                                                              "2012" : {"KPiPi": [5.2848e+05*(1-fracRun1)] }}}
-                                }
-
-    ############################################################
-    #"Code" to identify the True ID for each component
-    ############################################################
-
-    configdict["TrueID"] = {}
-    configdict["TrueID"] = {"Signal"          : 100,
-                            "Bd2DK"           : 200,
-                            "Bd2DRho"         : 300,
-                            "Bd2DstPi"        : 400,
-                            "Bd2DKst"         : 500,
-                            "Combinatorial"   : 600}
-
-    ############################################################
-    #List of PDFs for "time-independent" observables
-    #Dictionary structure: observable->component->bachelor hypo->year->D mode
-    ############################################################
-
-    Pipeak = 5.27849e+03
-    Kpeak = 5.27907e+03
-
-    configdict["PDFList"] = {}
-    configdict["PDFList"]["BeautyMass"] = {}
-
-    #Signal
-    configdict["PDFList"]["BeautyMass"]["Signal"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DPi"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DPi"]["2011"]["KPiPi"] = {"Type"       : "Ipatia",
-                                                                                "mean"       : [Pipeak],
-                                                                                "sigma"      : [1.96756e+01],
-                                                                                "zeta"       : [0.0],
-                                                                                "fb"         : [0.0],
-                                                                                "l"          : [-3.14504e+00],
-                                                                                "a1"         : [1.56363e+00], #left
-                                                                                "a2"         : [1.77887e+00], #right
-                                                                                "n1"         : [4.04491e+00], #left
-                                                                                "n2"         : [6.62043e+00]} #right
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DK"]["2011"]["KPiPi"] = {"Type"       : "Ipatia",
-                                                                               "mean"       : [5.32740e+03],
-                                                                               "sigma"      : [2.42675e+01],
-                                                                               "zeta"       : [0.0],
-                                                                               "fb"         : [0.0],
-                                                                               "l"          : [-5.46421e+00],
-                                                                               "a1"         : [3.04325e+00],
-                                                                               "a2"         : [6.62837e-01],
-                                                                               "n1"         : [6.79609e-02],
-                                                                               "n2"         : [2.09572e+00]}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DPi"]["2012"] = configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DPi"]["2011"]
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DK"]["2012"] = configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DK"]["2011"]
-
-    #Bd2DK
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bd2DPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bd2DPi"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bd2DPi"]["2011"]["KPiPi"] = {"Type"       : "Ipatia",
-                                                                               "mean"       : [5.23938e+03],
-                                                                               "sigma"      : [2.59213e+01],
-                                                                               "zeta"       : [0.0],
-                                                                               "fb"         : [0.0],
-                                                                               "l"          : [-3.98519e+01],
-                                                                               "a1"         : [9.68988e-01],
-                                                                               "a2"         : [1.23156e+00],
-                                                                               "n1"         : [3.49691e+00],
-                                                                               "n2"         : [1.00524e+01]}
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bd2DK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bd2DK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bd2DK"]["2011"]["KPiPi"] = {"Type"       : "Ipatia",
-                                                                              "mean"       : [Kpeak],
-                                                                              "sigma"      : [1.74271e+01],
-                                                                              "zeta"       : [0.0],
-                                                                              "fb"         : [0.0],
-                                                                              "l"          : [-3.22645e+00],
-                                                                              "a1"         : [2.60724e+00],
-                                                                              "a2"         : [1.0e+09],
-                                                                              "n1"         : [1.00877e+00],
-                                                                              "n2"         : [0.0]}
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bd2DPi"]["2012"] = configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bd2DPi"]["2011"]
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bd2DK"]["2012"] = configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bd2DK"]["2011"]
-
-    #Bd2DRho
-    configdict["PDFList"]["BeautyMass"]["Bd2DRho"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DRho"]["Bd2DPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DRho"]["Bd2DPi"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DRho"]["Bd2DPi"]["2011"]["KPiPi"] = {"Type"      : "JohnsonSU",
-                                                                                 "mean"      : [4.71618e+03],
-                                                                                 "sigma"     : [9.01304e+02],
-                                                                                 "nu"        : [-2.01671e+00],
-                                                                                 "tau"       : [1.29155e+00]}
-    configdict["PDFList"]["BeautyMass"]["Bd2DRho"]["Bd2DK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DRho"]["Bd2DK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DRho"]["Bd2DK"]["2011"]["KPiPi"] = {"Type"       : "DoubleGaussian",
-                                                                                "mean"       : [5.14019e+03],
-                                                                                "sigma1"     : [9.00002e+01],
-                                                                                "sigma2"     : [1.55484e+02],
-                                                                                "frac"       : [8.30742e-01]}
-    configdict["PDFList"]["BeautyMass"]["Bd2DRho"]["Bd2DPi"]["2012"] =  configdict["PDFList"]["BeautyMass"]["Bd2DRho"]["Bd2DPi"]["2011"]
-    configdict["PDFList"]["BeautyMass"]["Bd2DRho"]["Bd2DK"]["2012"] = configdict["PDFList"]["BeautyMass"]["Bd2DRho"]["Bd2DK"]["2011"]
-
-    #Bd2DstPi
-    configdict["PDFList"]["BeautyMass"]["Bd2DstPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DstPi"]["Bd2DPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DstPi"]["Bd2DPi"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DstPi"]["Bd2DPi"]["2011"]["KPiPi"] = {"Type"        : "CrystalBallPlusGaussian",
-                                                                                  "mean"        : [5.10033e+03],
-                                                                                  "alpha"       : [-1.63404e+00],
-                                                                                  "n"           : [4.65946e+00],
-                                                                                  "sigmaCB"     : [4.15131e+01],
-                                                                                  "sigmaG"      : [1.79617e+01],
-                                                                                  "fracG"       : [1.32304e-01]}
-    configdict["PDFList"]["BeautyMass"]["Bd2DstPi"]["Bd2DK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DstPi"]["Bd2DK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DstPi"]["Bd2DK"]["2011"]["KPiPi"] = {"Type"        : "None"}
-    configdict["PDFList"]["BeautyMass"]["Bd2DstPi"]["Bd2DPi"]["2012"] = configdict["PDFList"]["BeautyMass"]["Bd2DstPi"]["Bd2DPi"]["2011"]
-    configdict["PDFList"]["BeautyMass"]["Bd2DstPi"]["Bd2DK"]["2012"] = configdict["PDFList"]["BeautyMass"]["Bd2DstPi"]["Bd2DK"]["2011"]
-
-    #Bd2DKst
-    configdict["PDFList"]["BeautyMass"]["Bd2DKst"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DKst"]["Bd2DPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DKst"]["Bd2DPi"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DKst"]["Bd2DPi"]["2011"]["KPiPi"] = {"Type"        : "None"}
-    configdict["PDFList"]["BeautyMass"]["Bd2DKst"]["Bd2DK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DKst"]["Bd2DK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DKst"]["Bd2DK"]["2011"]["KPiPi"] = {"Type"       : "Gaussian",
-                                                                                "mean"       : [5.08528e+03],
-                                                                                "sigma"      : [3.76140e+01]}
-    configdict["PDFList"]["BeautyMass"]["Bd2DKst"]["Bd2DPi"]["2012"] = configdict["PDFList"]["BeautyMass"]["Bd2DKst"]["Bd2DPi"]["2011"]
-    configdict["PDFList"]["BeautyMass"]["Bd2DKst"]["Bd2DK"]["2012"] = configdict["PDFList"]["BeautyMass"]["Bd2DKst"]["Bd2DK"]["2011"]
-
-    #Combinatorial
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"] = {}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bd2DPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bd2DPi"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bd2DPi"]["2011"]["KPiPi"] = {"Type"       : "ExponentialPlusConstant",
-                                                                                       "cB"           : [-5.59102e-03],
-                                                                                       "fracExpo"     : [8.77658e-01]}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bd2DK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bd2DK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bd2DK"]["2011"]["KPiPi"] = {"Type"       : "ExponentialPlusConstant",
-                                                                                      "cB"           : [-4.15525e-03],
-                                                                                      "fracExpo"     : [9.38575e-01]}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bd2DPi"]["2012"] = configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bd2DPi"]["2011"]
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bd2DK"]["2012"] = configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bd2DK"]["2011"]
-
-    ############################################################
-    #Tagging calibration and mistag PDF. If "MistagPDF" : None,
-    #then a average mistag is used
-    ############################################################
-
-    configdict["Taggers"] = {}
-    for comp in configdict["Components"].keys():
-        configdict["Taggers"][comp] = {}
-        configdict["Taggers"][comp] = {"OS" : #From Bu, stat and syst combined
-                                       {"Calibration":
-                                        {"p0"       : [0.3737056],
-                                         "p1"       : [1.028621],
-                                         "deltap0"  : [0.011819],
-                                         "deltap1"  : [0.043134],
-                                         "avgeta"   : [0.347742], #<eta> on spline-corrected Bu->D0Pi
-                                         "tageff"   : [0.371],
-                                         "tagasymm" : [0.0]
-                                         },
-                                        "MistagPDF" :
-                                        {"Type"       : "FromWorkspace",
-                                         "File"       : "root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MistagTemplates/templates_mistag.root",
-                                         "Workspace"  : "workspace",
-                                         "Name"       : "sigMistagPdf_2"
-                                         }
-                                        },
-                                       "SS": #From JpsiKst, stat and syst combined
-                                       {"Calibration":
-                                        {"p0"       : [0.4424049],
-                                         "p1"       : [0.81302],
-                                         "deltap0"  : [0.00062332],
-                                         "deltap1"  : [0.0066248],
-                                         "avgeta"   : [0.435], #<eta> on Bd->J/psiK*
-                                         "tageff"   : [0.816],
-                                         "tagasymm" : [0.0]
-                                         },
-                                        "MistagPDF" :
-                                        {"Type"       : "FromWorkspace",
-                                         "File"       : "root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MistagTemplates/templates_mistag.root",
-                                         "Workspace"  : "workspace",
-                                         "Name"       : "sigMistagPdf_1"
-                                         }
-                                        }
-                                       }
-
-    ############################################################
-    #Time resolution and acceptance (there is a single dict because
-    #they are strongly connected in the way they are built).
-    #If "TimeErrorPDF" : None, then an average resolution model
-    #is used.
-    ############################################################
-
-    configdict["ResolutionAcceptance"] = {}
-    for comp in configdict["Components"].keys():
-        configdict["ResolutionAcceptance"][comp] = {}
-        configdict["ResolutionAcceptance"][comp] = {"TimeErrorPDF": None,
-                                                    "Acceptance":  #From ANA note v2
-                                                    {"Type": "Spline",
-                                                     "KnotPositions" : [ 0.5, 1.0, 1.5, 2.0, 3.0, 12.0 ],
-                                                     "KnotCoefficients" : [ 0.3889, 0.5754, 0.8515, 1.0649, 1.2373, 1.4149]},
-                                                    "Resolution": #From ANA note v2
-                                                    {"Type": "AverageModel",
-                                                     "Parameters": { 'sigmas': [ 0.05491 ], 'fractions': [] },
-                                                     "Bias": [0.0],
-                                                     "ScaleFactor": [1.0]}
-                                                    }
-
-    ############################################################
-    #Production and detection asymmetries
-    ############################################################
-
-    configdict["ProductionAsymmetry"] = {}
-    configdict["DetectionAsymmetry"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = {}
-    configdict["DetectionAsymmetry"]["Signal"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = [-0.0124] #from ANA note v2
-    configdict["DetectionAsymmetry"]["Signal"] = [0.0086] #from arXiv:1408.0275v2 (OPPOSITE SIGN!!!)
-    for comp in configdict["Components"].keys():
-        if comp != "Signal":
-            #We don't really care about background
-            configdict["ProductionAsymmetry"][comp] = {}
-            configdict["DetectionAsymmetry"][comp] = {}
-            configdict["ProductionAsymmetry"][comp] = [0.0]
-            configdict["DetectionAsymmetry"][comp] = [0.0]
-
-    ############################################################
-    #Time PDF parameters
-    ############################################################
-
-    configdict["ACP"] = {}
-
-    #Parameters from https://svnweb.cern.ch/trac/lhcb/browser/DBASE/tags/Gen/DecFiles/v27r42/dkfiles/Bd_D-pi+,Kpipi=CPVDDalitz,DecProdCut.dec)
-    ModqOverp_d     =  1
-    ArgqOverp_d     =  -0.746
-    ModpOverq_d     =  1
-    ArgpOverq_d     =  0.746
-    ModAf_d         =  0.0849
-    ArgAf_d         =  0.002278
-    ModAbarf_d      =  0.00137
-    ArgAbarf_d      =  -1.128958
-    ModAfbar_d      =  0.00137
-    ArgAfbar_d      =  1.3145
-    ModAbarfbar_d   =  0.0849
-    ArgAbarfbar_d   =  0.002278
-
-    #Signal (use more convenient interface with ArgLf_d, ArgLbarfbar_d and ModLf_d)
-    configdict["ACP"]["Signal"] = { "Gamma"                : [1.0 / 1.520], #Inverse lifetime from HFAG (http://www.slac.stanford.edu/xorg/hfag/osc/summer_2016/)
-                                    "DeltaGamma"           : [0.0],
-                                    "DeltaM"               : [0.5064], #Global average from HFAG (http://www.slac.stanford.edu/xorg/hfag/osc/summer_2016/)
-                                    #"ArgLf"                : [ArgqOverp_d + ArgAbarf_d - ArgAf_d],
-                                    #"ArgLbarfbar"          : [ArgpOverq_d + ArgAfbar_d - ArgAbarfbar_d],
-                                    #"ModLf"                : [ModAbarf_d/ModAf_d],
-                                    "C"                    : [1.0], #we neglect r^2 terms
-                                    "S"                    : [-0.031], #from decfile
-                                    "Sbar"                 : [0.029], #from decfile
-                                    "D"                    : [0], #from DeltaGamma=0
-                                    "Dbar"                 : [0], #from DeltaGamma=0
-                                    "ParameteriseIntegral" : True,
-                                    "NBinsAcceptance"      : 0} #keep at zero if using spline acceptance!
-
-    for comp in configdict["Components"].keys():
-        if comp != "Signal":
-            #Use other interface with C, S, Sbar, D, Dbar
-            #We build trivial PDFs since we don't care about background shapes in time if we use sWeights
-            configdict["ACP"][comp] = { "Gamma"                 : [1.0],
-                                        "DeltaGamma"            : [0.0],
-                                        "DeltaM"                : [0.0],
-                                        "C"                     : [0.0],
-                                        "S"                     : [0.0],
-                                        "Sbar"                  : [0.0],
-                                        "D"                     : [0.0],
-                                        "Dbar"                  : [0.0],
-                                        "ParameteriseIntegral"  : True,
-                                        "NBinsAcceptance"       : 0}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForToys.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForToys.py
deleted file mode 100644
index 2651e17f8a36bc1c8c3dcf3f362469f6358a0ad1..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForToys.py
+++ /dev/null
@@ -1,388 +0,0 @@
-from __future__ import division
-from past.utils import old_div
-from ROOT import *
-
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bd2DPi"
-    configdict["CharmModes"] = {"KPiPi"} 
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2012"} 
-    # stripping (necessary in case of PIDK shapes)
-    configdict["Stripping"] = {"2012":"21"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes) 
-    configdict["IntegratedLuminosity"] = {"2012": {"Down": 0.59, "Up": 0.44}}
-    configdict["LumRatio"] = {"2012" :
-                              old_div(configdict["IntegratedLuminosity"]["2012"]["Up"], ( configdict["IntegratedLuminosity"]["2012"]["Up"] + configdict["IntegratedLuminosity"]["2012"]["Down"] )) }
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "../data/Bd2DPi_3fbCPV/Bd2DPi/config_Bd2DPi.txt"
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5000,    6000    ],
-                                                      "Sideband"               : [5500,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_MassFitConsD_M"}
-
-    configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1910    ],
-                                                      "Name"                   : "CharmMass",
-                                                      "InputName"              : "lab2_MM"}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.0,     15.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "lab0_LifetimeFit_ctau"}
-    
-    configdict["BasicVariables"]["BacP"]          = { "Range"                  : [3000.0,  650000.0],
-                                                      "Name"                   : "BacP",
-                                                      "InputName"              : "lab1_P"}
-
-    configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-                                                      "Name"                   : "BacPT",
-                                                      "InputName"              : "lab1_PT"}
-
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [1.61,    5.0     ],
-                                                      "Name"                   : "BacPIDK",
-                                                      "InputName"              : "lab1_PIDK"}
-
-    configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-                                                      "Name"                   : "nTracks",
-                                                      "InputName"              : "nTracks"}
-
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range"                  : [0.01,    0.1     ],
-                                                      "Name"                   : "BeautyTimeErr",
-                                                      "InputName"              : "lab0_LifetimeFit_ctauErr"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_ID"}
-
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecOS",
-                                                      "InputName"              : "lab0_TAGDECISION_OS"}
-
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecSS",
-                                                      "InputName"              : "lab0_SS_Pion_DEC"} 
-
-    configdict["BasicVariables"]["MistagOS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagOS",
-                                                      "InputName"              : "lab0_TAGOMEGA_OS"}
-
-    configdict["BasicVariables"]["MistagSS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagSS",
-                                                      "InputName"              : "lab0_SS_Pion_PROB"}
-
-    # additional MC variables in data sets
-    configdict["MCVariables"] = {}
-    configdict["MCVariables"]["BeautyBkgCat"]  =  { "Range"                    : [ -1.0,    1000.0 ],
-                                                    "Name"                     : "BeautyBkgCat",
-                                                    "InputName"                : "lab0_BKGCAT"}
-    
-    configdict["MCVariables"]["BeautyTrueID"]  =  { "Range"                    : [ -1000.0, 1000.0 ],
-                                                    "Name"                     : "BeautyTrueID",
-                                                    "InputName"                : "lab0_TRUEID"}
-    
-
-    # additional taggers
-    configdict["AdditionalTagDec"] = {}
-    configdict["AdditionalTagDec"]["TagDecSSProton"]   =  { "Range"            : [-1.0,    1.0     ],
-                                                            "Name"             : "TagDecSSProton",
-                                                            "InputName"        : "lab0_SS_Proton_DEC"}
-
-    configdict["AdditionalTagDec"]["TagDecSSPion"]  =  { "Range"               : [-1.0,    1.0     ],
-                                                         "Name"                : "TagDecSSPionBDT",
-                                                         "InputName"           : "lab0_SS_PionBDT_DEC"}
-    
-    configdict["AdditionalTagDec"]["TagDecOSCharm"]   =  { "Range"            : [-1.0,    1.0     ],
-                                                           "Name"             : "TagDecOSCharm",
-                                                           "InputName"        : "lab0_OS_Charm_DEC"}
-    
-    
-    configdict["AdditionalTagOmega"] = {}
-    configdict["AdditionalTagOmega"]["MistagSSProton"]  =  { "Range"           : [0.0,     0.5     ],
-                                                             "Name"            : "MistagSSProton",
-                                                             "InputName"       : "lab0_SS_Proton_PROB"}
-    
-    configdict["AdditionalTagOmega"]["MistagSSPion"] =  { "Range"              : [0.0,     0.5     ],
-                                                          "Name"               : "MistagSSPionBDT",
-                                                          "InputName"          : "lab0_SS_PionBDT_PROB"}
-    
-    configdict["AdditionalTagOmega"]["MistagOSCharm"]  =  { "Range"           : [0.0,     0.5     ],
-                                                            "Name"            : "MistagOSCharm",
-                                                            "InputName"       : "lab0_OS_Charm_PROB"}
-    
-
-    # tagging calibration
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"]    = {"p0"   : 0.365517, "p1"   : 0.950216, "average"   : 0.371147,
-                                                 "p0Bar": 0.376730, "p1Bar": 1.048155, "averageBar": 0.371147}
-    configdict["TaggingCalibration"]["SS"]    = {"p0"   : 0.424801, "p1"   : 1.004340, "average"   : 0.414892,
-                                                 "p0Bar": 0.404896, "p1Bar": 0.995879, "averageBar": 0.414892}
-    configdict["TaggingCalibration"]["OS+SS"] = {"p0"   : 0.338781, "p1"   : 0.971845, "average"   : 0.338493,
-                                                 "p0Bar": 0.338363, "p1Bar": 1.027861, "averageBar": 0.338493}
-
-    # taggers to be combined in a new tree
-    configdict["CombTaggers"] = {}
-    configdict["CombTaggers"]["SS"] = {"InputDec"            : [ "lab0_SS_PionBDT_DEC"   , "lab0_SS_Pion_DEC"     , "lab0_SS_Proton_DEC"  ],
-                                       "InputDecFormat"      : [ "S"                     , "S"                    , "S"                   ],
-                                       "InputOmega"          : [ "lab0_SS_PionBDT_PROB"  , "lab0_SS_Pion_PROB"    , "lab0_SS_Proton_PROB" ],
-                                       "InputOmegaFormat"    : [ "F"                     , "F"                    , "F"                   ],
-                                       "OutputDec"           : "lab0_TAGDECISION_SS",
-                                       "OutputDecFormat"     : "I",
-                                       "OutputOmega"         : "lab0_TAGOMEGA_SS",
-                                       "OutputOmegaFormat"   : "D"}
-
-    # tagging efficiency and asymmetry
-    configdict["tagEff_OS"] = 0.387
-    configdict["tagEff_SS"] = 0.4772
-    configdict["tagEff_OS_Lb"] = 0.001
-    configdict["tagEff_SS_Lb"] = 0.999
-    configdict["tagEff_OS_Combo"] = 0.594
-    configdict["tagEff_SS_Combo"] = 0.462
-    configdict["tagEff_Lb2LcPi"] = [configdict["tagEff_OS_Lb"] - configdict["tagEff_OS_Lb"]*configdict["tagEff_SS_Lb"],
-                                    configdict["tagEff_SS_Lb"] - configdict["tagEff_OS_Lb"]*configdict["tagEff_SS_Lb"],
-                                    configdict["tagEff_OS_Lb"]*configdict["tagEff_SS_Lb"]]
-    configdict["tagEff_Signal"]    = [configdict["tagEff_OS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_SS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_OS"]*configdict["tagEff_SS"]]
-    configdict["tagEff_Combo"]     = [configdict["tagEff_OS_Combo"] - configdict["tagEff_OS_Combo"]*configdict["tagEff_SS_Combo"],
-                                      configdict["tagEff_SS_Combo"] - configdict["tagEff_OS_Combo"]*configdict["tagEff_SS_Combo"],
-                                      configdict["tagEff_OS_Combo"]*configdict["tagEff_SS_Combo"]]
-
-    configdict["TagEff"] = {}
-    configdict["TagEff"]["Signal"]    = configdict["tagEff_Signal"]
-    configdict["TagEff"]["Bd2DK"]     = configdict["tagEff_Signal"]
-    configdict["TagEff"]["Bs2DsPi"]   = configdict["tagEff_Signal"]
-    configdict["TagEff"]["Lb2LcPi"]   = configdict["tagEff_Lb2LcPi"]
-    configdict["TagEff"]["Combo"]     = configdict["tagEff_Combo"]
-    configdict["TagEff"]["ComboFull"] = [ [1.0, 0.0, 0.0],
-                                          [0.0, 1.0, 0.0],   
-                                          [0.0, 0.0, 1.0],
-                                          [0.0, 0.0, 0.0] ]
-    configdict["TagEff"]["Bd2DRho"]   = configdict["tagEff_Signal"]
-    configdict["TagEff"]["Bd2DstPi"]  = configdict["tagEff_Signal"]
-                            
-
-    configdict["ATagEff"] = {}
-    configdict["ATagEff"]["Signal"]   = [0.0, 0.0, 0.0]
-    configdict["ATagEff"]["Bd2DK"]    = [0.0, 0.0, 0.0]
-    configdict["ATagEff"]["Bs2DsPi"]  = [0.0, 0.0, 0.0]
-    configdict["ATagEff"]["Lb2LcPi"]  = [0.0, 0.0, 0.0]
-    configdict["ATagEff"]["Combo"]    = [0.0, 0.0, 0.0]
-    configdict["ATagEff"]["Bd2DRho"]  = [0.0, 0.0, 0.0]
-    configdict["ATagEff"]["Bd2DstPi"] = [0.0, 0.0, 0.0]
-
-    # k factor (not implemented at all for Bd->DPi...)
-    configdict["UseKFactor"] = False
-
-    # production and detection asymmetries
-    configdict["AProd"] = {}
-    configdict["AProd"]["Signal"]   = 0.00943518
-    configdict["AProd"]["Bd2DK"]    = 0.00943518
-    configdict["AProd"]["Bs2DsPi"]  = -0.0175698
-    configdict["AProd"]["Lb2LcPi"]  = 0.0301775
-    configdict["AProd"]["Combo"]    = -0.01
-    configdict["AProd"]["Bd2DRho"]  = 0.0
-    configdict["AProd"]["Bd2DstPi"] = 0.0
-                           
-
-    configdict["ADet"] = {}
-    configdict["ADet"]["Signal"]   = 0.00502173
-    configdict["ADet"]["Bd2DK"]    = 0.0100174
-    configdict["ADet"]["Bs2DsPi"]  = 0.00608738
-    configdict["ADet"]["Lb2LcPi"]  = 0.00515764
-    configdict["ADet"]["Combo"]    = 0.00987629
-    configdict["ADet"]["Bd2DRho"] = 0.0
-    configdict["ADet"]["Bd2DstPi"] = 0.0
-
-    # decay rate and CP parameters (see https://svnweb.cern.ch/trac/lhcb/browser/DBASE/tags/Gen/DecFiles/v27r42/dkfiles/Bd_D-pi+,Kpipi=CPVDDalitz,DecProdCut.dec)
-    ModqOverp_d     =  1          
-    ArgqOverp_d     =  -0.746     
-    ModpOverq_d     =  1          
-    ArgpOverq_d     =  0.746      
-    ModAf_d         =  0.0849     
-    ArgAf_d         =  0.002278   
-    ModAbarf_d      =  0.00137    
-    ArgAbarf_d      =  -1.128958  
-    ModAfbar_d      =  0.00137    
-    ArgAfbar_d      =  1.3145     
-    ModAbarfbar_d   =  0.0849     
-    ArgAbarfbar_d   =  0.002278   
-
-    StrongPhase_s   = 4. / 180. * pi
-    WeakPhase       = 116. / 180. * pi
-    
-    configdict["DecayRate"] = {}
-    configdict["DecayRate"]["Gammad"]          = 0.656
-    configdict["DecayRate"]["DeltaGammad"]     = 0.00267 #-> arXiv:1007.5135 (SM only, no new physics)
-    configdict["DecayRate"]["DeltaMd"]         = 0.510
-    configdict["DecayRate"]["Gammas"]          = 0.661
-    configdict["DecayRate"]["DeltaGammas"]     = -0.105
-    configdict["DecayRate"]["DeltaMs"]         = 17.768
-    configdict["DecayRate"]["GammaLb"]         = 0.676
-    configdict["DecayRate"]["GammaCombo"]      = [ 0.913,  1.451,  1.371,  0.745] #
-    configdict["DecayRate"]["DeltaGammaCombo"] = [ 0.845,  1.266,  1.282,  0.753] # Combo: one value for each tagging cat (OS, SS OS+SS, UN)
-    configdict["DecayRate"]["D_Combo"]         = [-0.908, -0.775, -0.913, -0.938] #
-    configdict["DecayRate"]["ArgLf_d"]         = ArgqOverp_d + ArgAbarf_d - ArgAf_d
-    configdict["DecayRate"]["ArgLbarfbar_d"]   = ArgpOverq_d + ArgAfbar_d - ArgAbarfbar_d
-    configdict["DecayRate"]["ModLf_d"]         = old_div(ModAbarf_d,ModAf_d)
-    configdict["DecayRate"]["ArgLf_s"]         = StrongPhase_s - WeakPhase  
-    configdict["DecayRate"]["ArgLbarfbar_s"]   = StrongPhase_s + WeakPhase
-    configdict["DecayRate"]["ModLf_s"]         = 0.51                            
-
-    configdict['UseAvgDelta'] = False
-
-    # time acceptance configuration (spline)
-    configdict["AcceptanceFunction"] = 'Spline'
-    configdict["AcceptanceKnots"] = [0.5, 1.0, 1.5, 2.0, 3.0, 12.0]
-    configdict["AcceptanceValues"] = [0.4453873694523979, 0.6869245867352556, 0.8719680916278891, 1.1614426699209424, 1.2341250036543179, 1.2852701638596233]
-    configdict["NBinsAcceptance"] = 0
-
-    # time resolution model configuration
-    configdict["DecayTimeResolutionPEDTE"] = 'GaussianWithPEDTE'
-    configdict["DecayTimeResolutionMeanModel"] = [ [2.21465e-02, 3.72057e-02, 6.37859e-02],
-                                                   [3.62689e-01, 5.65100e-01] ]
-    configdict["DecayTimeResolutionQuasiPerfect"] = [ [0.00005], []]
-    
-    configdict["DecayTimeResolutionBias"] = 0.0
-    configdict["DecayTimeResolutionScaleFactor"] = 1.37
-
-    configdict["NBinsProperTimeErr"] = 100
-    
-    # parameterize time resolution x acceptance integral (speed up generation with per-event time error)
-    configdict["ParameteriseIntegral"] = True
-    
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts   
-    # order of particles: KPiPi 
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3":"lab5"}
-
-    # Bs signal shapes                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBall"
-    configdict["BsSignalShape"]["mean"]    = {"All":5279.58} #From PDG 2014
-    configdict["BsSignalShape"]["sigma1"]  = {"2012": {"KPiPi":1.0717e+01}, "Fixed":True}
-    configdict["BsSignalShape"]["sigma2"]  = {"2012": {"KPiPi":1.6005e+01}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha1"]  = {"2012": {"KPiPi":2.2118e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha2"]  = {"2012": {"KPiPi":-2.4185e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["n1"]      = {"2012": {"KPiPi":1.0019e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"2012": {"KPiPi":3.1469e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["frac"]    = {"2012": {"KPiPi":6.1755e-01}, "Fixed":True}
-    configdict["BsSignalShape"]["scaleSigma"] = { "2012": {"frac1": 1.0, "frac2":1.0}}
-
-    #Ds signal shapes                                                                                                
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBall"
-    configdict["DsSignalShape"]["mean"]    = {"All":1869.61} #From PDG 2014
-    configdict["DsSignalShape"]["sigma1"]  = {"2012": {"KPiPi":5.3468e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["sigma2"]  = {"2012": {"KPiPi":5.1848e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha1"]  = {"2012": {"KPiPi":1.2252e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha2"]  = {"2012": {"KPiPi":-1.1167e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["n1"]      = {"2012": {"KPiPi":4.6625e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["n2"]      = {"2012": {"KPiPi":6.9989e+01}, "Fixed":True}
-    configdict["DsSignalShape"]["frac"]    = {"2012": {"KPiPi":4.7565e-01}, "Fixed":True}
-    configdict["DsSignalShape"]["scaleSigma"] = { "2012": {"frac1": 1.0, "frac2":1.0}}
- 
-    # combinatorial background                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"] = "Exponential"
-    configdict["BsCombinatorialShape"]["cB"]   = {"2012":{"KPiPi":-9.8158e-04}, "Fixed":True}
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal"
-    configdict["DsCombinatorialShape"]["cD"]         = {"2012": {"KPiPi":-1.0743e-03}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["fracCombD"]   = {"2012": {"KPiPi":1.0}, "Fixed":{"KPiPi":True}}
-
-    
-    #expected yields
-    size = 0.1
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bd2DK"]              = {"2012": {"KPiPi":1825*(490000.0/109420.0)*size}, "Fixed":False}
-    configdict["Yields"]["Bs2DsPi"]            = {"2012": {"KPiPi":1294*(490000.0/109420.0)*size}, "Fixed":False}
-    configdict["Yields"]["Bd2DRho"]            = {"2012": {"KPiPi":54240*(490000.0/109420.0)*size}, "Fixed":False}
-    configdict["Yields"]["Bd2DstPi"]           = {"2012": {"KPiPi":24395*(490000.0/109420.0)*size}, "Fixed":False}
-    configdict["Yields"]["Lb2LcPi"]            = {"2012": {"KPiPi":213*(490000.0/109420.0)*size}, "Fixed":False}
-    configdict["Yields"]["Combo"]              = {"2012": {"KPiPi":23413*(490000.0/109420.0)*size},  "Fixed":False}
-    configdict["Yields"]["Signal"]             = {"2012": {"KPiPi":490000*size} , "Fixed":False}
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#            
-    ###                                                               MDfit plotting settings                                                                                 
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------# 
-    
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = { "EPDF": ["Sig", "CombBkg", "Lb2LcPi", "Bd2DK", "Bs2DsPi", "Bd2DRho", "Bd2DstPi"],
-                                                 "PDF":  ["Sig", "CombBkg", "Lb2LcPi", "Bd2DK", "Bs2DsPi", "Bd2DRho", "Bd2DstPi"],
-                                                 "Legend": ["Sig", "CombBkg", "Lb2LcPi", "Bd2DK", "Bs2DsPi", "Bd2DRho", "Bd2DstPi"]}
-    configdict["PlotSettings"]["colors"] = { "PDF": [kRed-7, kMagenta-2, kGreen-3, kYellow-9, kBlue-6, kRed, kBlue-10],
-                                             "Legend": [kRed-7, kMagenta-2, kGreen-3, kYellow-9, kBlue-6, kRed, kBlue-10]}
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"]["Directory"] = "/afs/cern.ch/work/v/vibattis/public/B2DX/Bd2DPi/Templates/NoSelection_test"
-    configdict["ControlPlots"]["Extension"] = "eps"
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                                   Workspaces                                                                    
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-
-    #Toy generation and fitting
-    configdict["Toys"] = {}
-    configdict["Toys"]["fileName"]                         = "/afs/cern.ch/work/v/vibattis/public/B2DX/Bd2DPi/Workspace/NoSelection/work_dpi.root"
-    configdict["Toys"]["fileNameTerr"]                     = "../data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root"
-    configdict["Toys"]["fileNameMistag"]                   = "../data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root"
-    configdict["Toys"]["fileNameMistagBDPi"]               = "../data/workspace/MDFitter/template_Data_Mistag_BDPi.root"
-    configdict["Toys"]["fileNameMistagComb"]               = "../data/workspace/MDFitter/template_Data_Mistag_CombBkg.root"
-    configdict["Toys"]["fileNameNoMistag"]                 = "../data/workspace/MDFitter/NoMistag.root"
-    configdict["Toys"]["Workspace"]                        = "workspace"
-    configdict["Toys"]["TerrTempName"]                     = "TimeErrorPdf_Bs2DsK"
-    configdict["Toys"]["MistagTempName"]                   = ["sigMistagPdf_1", "sigMistagPdf_2", "sigMistagPdf_3"]
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                               Constant parameters in the time fit                                                                 ###
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-
-    
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammad')
-    configdict["constParams"].append('C')
-    configdict["constParams"].append('Cbar')
-    configdict["constParams"].append('D')
-    configdict["constParams"].append('Dbar')
-    #configdict["constParams"].append('S')
-    #configdict["constParams"].append('Sbar')
-    configdict["constParams"].append('deltaGammad')
-    configdict["constParams"].append('deltaMd')
-    configdict["constParams"].append('tagEffSig_OS')
-    configdict["constParams"].append('tagEffSig_SS')
-    configdict["constParams"].append('tagEffSig_OS+SS')
-    configdict["constParams"].append('aprod')
-    configdict["constParams"].append('adet')
-    configdict["constParams"].append('aTagEff_OS')
-    configdict["constParams"].append('aTagEff_SS')
-    configdict["constParams"].append('aTagEff_OS+SS')
-    configdict["constParams"].append('p0_B_OS')
-    configdict["constParams"].append('p0_B_SS')
-    configdict["constParams"].append('p0_B_OS+SS')
-    configdict["constParams"].append('p1_B_OS')
-    configdict["constParams"].append('p1_B_SS')
-    configdict["constParams"].append('p1_B_OS+SS')
-    configdict["constParams"].append('p0_Bbar_OS')
-    configdict["constParams"].append('p0_Bbar_SS')
-    configdict["constParams"].append('p0_Bbar_OS+SS')
-    configdict["constParams"].append('p1_Bbar_OS')
-    configdict["constParams"].append('p1_Bbar_SS')
-    configdict["constParams"].append('p1_Bbar_OS+SS')
-    configdict["constParams"].append('.*_scalefactor')
-                                    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForToysGeneration.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForToysGeneration.py
deleted file mode 100644
index c0a19df7678d45799f4ffb740ae3b7eb0b3ff90a..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForToysGeneration.py
+++ /dev/null
@@ -1,225 +0,0 @@
-from __future__ import division
-from past.utils import old_div
-def getconfig() :
-
-    configdict = {}
-
-    ############################################################
-    #List of observables for all the PDFs.
-    #The content of this dictionary determines the observables
-    #to generate for and how may taggers are present.
-    ############################################################
-
-    configdict["Observables"] = {}
-    configdict["Observables"] = {"BeautyTime":    {"Type" : "RooRealVar",
-                                                   "Title" : "B decay time (ps)",
-                                                   "Range" : [0.4, 12.0]},
-                                 "BacCharge":     {"Type"  : "RooCategory",
-                                                   "Title" : "Bachelor charge",
-                                                   "Categories": { "h+" : +1,
-                                                                   "h-" : -1}},
-                                 "MistagOS":      {"Type" : "RooRealVar",
-                                                   "Title" : "#eta_{OS}",
-                                                   "Range" : [0.0, 0.5]},
-                                 "MistagSS":      {"Type" : "RooRealVar",
-                                                   "Title" : "#eta_{SS}",
-                                                   "Range" : [0.0,0.5]},
-                                 "TagDecOS":      {"Type"  : "RooCategory",
-                                                   "Title" : "q_{t}^{OS}",
-                                                   "Categories": { "B+"       : +1,
-                                                                   "Untagged" : 0,
-                                                                   "B-"       : -1}},
-                                 "TagDecSS":      {"Type"  : "RooCategory",
-                                                   "Title" : "q_{t}^{SS}",
-                                                   "Categories": { "B+"       : +1,
-                                                                   "Untagged" : 0,
-                                                                   "B-"       : -1}}
-                                 }
-
-    ############################################################
-    #List of mass hypotheses for bachelor
-    #The content of this dictionary determines how many
-    #bachelor PID bins the final dataset is splitted into
-    ############################################################
-
-    configdict["Hypothesys"] = ["Bd2DPi"]
-
-    ############################################################
-    #Signal decay and Charm decay mode
-    ############################################################
-
-    configdict["Decay"] = "Bd2DPi"
-    configdict["CharmModes"] = ["KPiPi"]
-    configdict["Years"] = ["2011","2012"]
-    configdict["MergedYears"] = True
-
-    ############################################################
-    #Luminosity for splitting yields and other parameters
-    ############################################################
-
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.50, "Up": 0.50}, "2012":{"Down": 1.000, "Up": 1.000}}
-    lum2011 =  configdict["IntegratedLuminosity"]["2011"]["Up"] + configdict["IntegratedLuminosity"]["2011"]["Down"]
-    lum2012 =  configdict["IntegratedLuminosity"]["2012"]["Up"] + configdict["IntegratedLuminosity"]["2012"]["Down"]
-    fracRun1 = old_div(lum2011,(lum2011 + lum2012))
-
-    ############################################################
-    #List of components with yields to generate.
-    #The content of this dictionary determines, for each
-    #PID bin, how many PDF components are generated.
-    #If there is only signal, a TTree ready for sFit is
-    #generated directly, without need for doing a (useless)
-    #mass fit.
-    ############################################################
-
-    configdict["Components"] = {}
-    configdict["Components"] = {"Signal"        : {"Bd2DPi": {"2011" : {"KPiPi": [479325.0*fracRun1] },
-                                                              "2012" : {"KPiPi": [479325.0*(1-fracRun1)]
-                                                                        }
-                                                              }
-                                                   }
-                                }
-
-    ############################################################
-    #"Code" to identify the True ID for each component
-    ############################################################
-
-    configdict["TrueID"] = {}
-    configdict["TrueID"] = {"Signal"          : 100}
-    
-    ############################################################
-    #Tagging calibration and mistag PDF. If "MistagPDF" : None,
-    #then an average mistag is used
-    ############################################################
-
-    configdict["Taggers"] = {}
-    for comp in configdict["Components"].keys():
-        configdict["Taggers"][comp] = {}
-        configdict["Taggers"][comp] = {"OS" :
-                                       {"Calibration":
-                                        {"p0"  : [0.37],
-                                         "p1"  : [0.8],
-                                         "deltap0" : [0.0017216],
-                                         "deltap1" : [0.051919],
-                                         "avgeta" : [0.37],
-                                         "tageff"   : [0.4],
-                                         "tagasymm" : [0.0]
-                                         },
-                                        "MistagPDF" :
-                                        {"Type"       : "FromWorkspace",
-                                         "File"       : "/eos/lhcb/wg/b2oc/TD_DPi_3fb/MistagTemplates/Bd2DPiDataTemplates.root",
-                                         "Workspace"  : "workspace",
-                                         "Name"       : "TemplateOS"
-                                         }
-                                        },
-                                       "SS" :
-                                       {"Calibration":
-                                        {"p0"  : [0.4],
-                                         "p1"  : [0.8],
-                                         "deltap0" : [0.0017216],
-                                         "deltap1" : [0.051919],
-                                         "avgeta" : [0.4],
-                                         "tageff"   : [0.9],
-                                         "tagasymm" : [0.0]
-                                         },
-                                        "MistagPDF" :
-                                        {"Type"       : "FromWorkspace",
-                                         "File"       : "/eos/lhcb/wg/b2oc/TD_DPi_3fb/MistagTemplates/Bd2DPiDataTemplates.root",
-                                         "Workspace"  : "workspace",
-                                         "Name"       : "TemplateSS"
-                                         }
-                                        }
-                                       }
-        #configdict["Taggers"][comp] = {"OS" :
-        #                               {"Calibration":
-        #                                { "Type": "GLM",
-        #                                  "XML": ["/eos/lhcb/wg/b2oc/TD_DPi_3fb/calibrations/RLogisticCalibration_Bu2D0Pi_OS_20171109.xml"],
-        #                                  "tageff"   : [0.432389],
-        #                                  "tagasymm" : [0.0]
-        #                                  },
-        #                                "MistagPDF" :
-        #                                {"Type"       : "FromWorkspace",
-        #                                 "File"       : "/eos/lhcb/wg/b2oc/TD_DPi_3fb/MistagTemplates/Bd2DPiDataTemplates.root",
-        #                                 "Workspace"  : "workspace",
-        #                                 "Name"       : "TemplateOS"
-        #                                 }
-        #                                },
-        #                               "SS":
-        #                               {"Calibration":
-        #                                { "Type": "GLM",
-        #                                  "XML": ["/eos/lhcb/wg/b2oc/TD_DPi_3fb/calibrations/RLogisticCalibration_Bd2JpsiKst_SS_20171101.xml"],
-        #                                  "tageff"   : [0.930458],
-        #                                  "tagasymm" : [0.0]
-        #                                  },
-        #                                "MistagPDF" :
-        #                                {"Type"       : "FromWorkspace",
-        #                                 "File"       : "/eos/lhcb/wg/b2oc/TD_DPi_3fb/MistagTemplates/Bd2DPiDataTemplates.root",
-        #                                 "Workspace"  : "workspace",
-        #                                 "Name"       : "TemplateSS"
-        #                                 }
-        #                                }
-        #                               }
-
-    ############################################################
-    #Time resolution and acceptance (there is a single dict because
-    #they are strongly connected in the way they are built).
-    #If "TimeErrorPDF" : None, then an average resolution model
-    #is used.
-    ############################################################
-
-    configdict["ResolutionAcceptance"] = {}
-    for comp in configdict["Components"].keys():
-        configdict["ResolutionAcceptance"][comp] = {}
-        configdict["ResolutionAcceptance"][comp] = {"TimeErrorPDF": None,
-                                                    "Acceptance":  #From ANA note v2
-                                                    {"Type": "Spline",
-                                                     "KnotPositions" : [0.5, 1.0, 1.5, 2.0, 2.3, 2.6, 3.0, 4.0, 10.0],
-                                                     "KnotCoefficients" : [1.9440e-01, 3.3275e-01, 6.1444e-01, 8.6628e-01, 9.9600e-01, 1.0745e+00, 1.1083e+00, 1.1565e+00, 1.1946e+00]},
-                                                    "Resolution": #From ANA note v2
-                                                    {"Type": "AverageModel",
-                                                     "Parameters": { 'sigmas': [ 0.05491 ], 'fractions': [] },
-                                                     "Bias": [0.0],
-                                                     "ScaleFactor": [1.0]}
-                                                    }
-
-    ############################################################
-    #Production and detection asymmetries
-    ############################################################
-
-    configdict["ProductionAsymmetry"] = {}
-    configdict["DetectionAsymmetry"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = {}
-    configdict["DetectionAsymmetry"]["Signal"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = [-0.00638385]#fitted on data #[0.0]#[-0.0124] #from ANA note v2
-    configdict["DetectionAsymmetry"]["Signal"] = [0.0086]#fitted on data #[0.0]#[0.0086] #from arXiv:1408.0275v2 (OPPOSITE SIGN!!!)
-
-    ############################################################
-    #Time PDF parameters
-    ############################################################
-
-    configdict["ACP"] = {}
-
-    #Parameters from https://svnweb.cern.ch/trac/lhcb/browser/DBASE/tags/Gen/DecFiles/v27r42/dkfiles/Bd_D-pi+,Kpipi=CPVDDalitz,DecProdCut.dec)
-    ModqOverp_d     =  1
-    ArgqOverp_d     =  -0.746
-    ModpOverq_d     =  1
-    ArgpOverq_d     =  0.746
-    ModAf_d         =  0.0849
-    ArgAf_d         =  0.002278
-    ModAbarf_d      =  0.00137
-    ArgAbarf_d      =  -1.128958
-    ModAfbar_d      =  0.00137
-    ArgAfbar_d      =  1.3145
-    ModAbarfbar_d   =  0.0849
-    ArgAbarfbar_d   =  0.002278
-
-    #Signal (use more convenient interface with ArgLf_d, ArgLbarfbar_d and ModLf_d)
-    configdict["ACP"]["Signal"] = { "Gamma"                : [1.0 / 1.518], #Inverse lifetime from HFAG (http://www.slac.stanford.edu/xorg/hfag/osc/summer_2016/)
-                                    "DeltaGamma"           : [0.0],
-                                    "DeltaM"               : [0.5050], #semileptonic measurement HFAG (http://www.slac.stanford.edu/xorg/hfag/osc/summer_2016/)
-                                    "ArgLf"                : [ArgqOverp_d + ArgAbarf_d - ArgAf_d],
-                                    "ArgLbarfbar"          : [ArgpOverq_d + ArgAfbar_d - ArgAbarfbar_d],
-                                    "ModLf"                : [old_div(ModAbarf_d,ModAf_d)],
-                                    "ParameteriseIntegral" : True,
-                                    "NBinsAcceptance"      : 0} #keep at zero if using spline acceptance!
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForToysGeneration_Alex.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForToysGeneration_Alex.py
deleted file mode 100644
index 5e949bf483671b2063b3272bd773ec57dd86994b..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForToysGeneration_Alex.py
+++ /dev/null
@@ -1,392 +0,0 @@
-from __future__ import division
-from past.utils import old_div
-def getconfig() :
-
-    configdict = {}
-
-    ############################################################
-    #List of observables for all the PDFs.
-    #The content of this dictionary determines the observables
-    #to generate for and how may taggers are present.
-    ############################################################
-
-    configdict["Observables"] = {}
-    configdict["Observables"] = {"BeautyMass":    {"Type"  : "RooRealVar",
-                                                   "Title" : "B mass (MeV/c^2)",
-                                                   "Range" : [5090, 6000]},
-                                 "BeautyTime":    {"Type" : "RooRealVar",
-                                                   "Title" : "B decay time (ps)",
-                                                   "Range" : [0.4, 15.0]},
-                                 #"BeautyTimeErr": {"Type" : "RooRealVar",
-                                 #                  "Title" : "B decay time error (ps)",
-                                 #                  "Range" : [0.01, 0.1]},
-                                 "BacCharge":     {"Type"  : "RooCategory",
-                                                   "Title" : "Bachelor charge",
-                                                   "Categories": { "h+" : +1,
-                                                                   "h-" : -1}},
-                                 "MistagOS":      {"Type" : "RooRealVar",
-                                                   "Title" : "#eta_{OS}",
-                                                   "Range" : [0.0,0.5]},
-                                 "MistagSS":      {"Type" : "RooRealVar",
-                                                   "Title" : "#eta_{SS}",
-                                                   "Range" : [0.0,0.5]},
-                                 "TrueID":        {"Type" : "RooRealVar",
-                                                   "Title" : "True component ID",
-                                                   "Range" : [0.0,1500.0]},
-                                 "TagDecOS":      {"Type"  : "RooCategory",
-                                                   "Title" : "q_{t}^{OS}",
-                                                   "Categories": { "B+"       : +1,
-                                                                   "Untagged" : 0,
-                                                                   "B-"       : -1}},
-                                 "TagDecSS":      {"Type"  : "RooCategory",
-                                                   "Title" : "q_{t}^{SS}",
-                                                   "Categories": { "B+"       : +1,
-                                                                   "Untagged" : 0,
-                                                                   "B-"       : -1}}
-                                 }
-
-    ############################################################
-    #List of mass hypotheses for bachelor
-    #The content of this dictionary determines how many
-    #bachelor PID bins the final dataset is splitted into
-    ############################################################
-
-    configdict["Hypothesys"] = ["Bd2DPi", "Bd2DK"]
-
-    ############################################################
-    #Signal decay and Charm decay mode
-    ############################################################
-
-    configdict["Decay"] = "Bd2DPi"
-    configdict["CharmModes"] = ["KPiPi"]
-    configdict["Years"] = ["2011","2012"]
-    configdict["MergedYears"] = True
-
-    ############################################################
-    #Luminosity for splitting yields and other parameters
-    ############################################################
-
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.50, "Up": 0.50}, "2012":{"Down": 1.000, "Up": 1.000}}
-    lum2011 =  configdict["IntegratedLuminosity"]["2011"]["Up"] + configdict["IntegratedLuminosity"]["2011"]["Down"]
-    lum2012 =  configdict["IntegratedLuminosity"]["2012"]["Up"] + configdict["IntegratedLuminosity"]["2012"]["Down"]
-    fracRun1 = old_div(lum2011,(lum2011 + lum2012))
-    DRho_to_DKst_KHypo = 8.5000e-01
-    eff_Bd2DK_DK = 6.29009e-01
-    eff_Bd2DPi_DPi = 9.78927e-01
-
-    ############################################################
-    #List of components with yields to generate.
-    #The content of this dictionary determines, for each
-    #PID bin, how many PDF components are generated.
-    #If there is only signal, a TTree ready for sFit is
-    #generated directly, without need for doing a (useless)
-    #mass fit.
-    ############################################################
-
-    configdict["Components"] = {}
-    configdict["Components"] = {"Signal"        : {"Bd2DPi": {"2011" : {"KPiPi": [5.2848e+05*fracRun1] },
-                                                              "2012" : {"KPiPi": [5.2848e+05*(1-fracRun1)] }},
-                                                   "Bd2DK" : {"2011" : {"KPiPi": [(old_div((1-eff_Bd2DPi_DPi),eff_Bd2DPi_DPi))*5.2848e+05*fracRun1] },
-                                                              "2012" : {"KPiPi": [(old_div((1-eff_Bd2DPi_DPi),eff_Bd2DPi_DPi))*5.2848e+05*(1-fracRun1)] }}},
-                                "Bd2DK"         : {"Bd2DPi": {"2011" : {"KPiPi": [(old_div((1-eff_Bd2DK_DK),eff_Bd2DK_DK))*3.0795e+04*fracRun1] },
-                                                              "2012" : {"KPiPi": [(old_div((1-eff_Bd2DK_DK),eff_Bd2DK_DK))*3.0795e+04*(1-fracRun1)] }},
-                                                   "Bd2DK" : {"2011" : {"KPiPi": [3.0795e+04*fracRun1] },
-                                                              "2012" : {"KPiPi": [3.0795e+04*(1-fracRun1)] }}},
-                                "Bd2DRho"       : {"Bd2DPi": {"2011" : {"KPiPi": [7.5224e+04*fracRun1] },
-                                                              "2012" : {"KPiPi": [7.5224e+04*(1-fracRun1)] }},
-                                                   "Bd2DK" : {"2011" : {"KPiPi": [DRho_to_DKst_KHypo*3.7873e+03*fracRun1] },
-                                                              "2012" : {"KPiPi": [DRho_to_DKst_KHypo*3.7873e+03*(1-fracRun1)] }}},
-                                "Bd2DstPi"      : {"Bd2DPi": {"2011" : {"KPiPi": [6.1404e+04*fracRun1] },
-                                                              "2012" : {"KPiPi": [6.1404e+04*(1-fracRun1)] }},
-                                                   "Bd2DK" : {"2011" : {"KPiPi": [0] },
-                                                              "2012" : {"KPiPi": [0] }}},
-                                "Bd2DKst"       : {"Bd2DPi": {"2011" : {"KPiPi": [0] },
-                                                              "2012" : {"KPiPi": [0] }},
-                                                   "Bd2DK" : {"2011" : {"KPiPi": [3.7873e+03*fracRun1] },
-                                                              "2012" : {"KPiPi": [3.7873e+03*(1-fracRun1)] }}},
-                                "Combinatorial" :  {"Bd2DPi": {"2011" : {"KPiPi": [4.8362e+04*fracRun1] },
-                                                               "2012" : {"KPiPi": [4.8362e+04*(1-fracRun1)] }},
-                                                    "Bd2DK" : {"2011" : {"KPiPi": [2.1674e+04*fracRun1] },
-                                                               "2012" : {"KPiPi": [2.1674e+04*(1-fracRun1)] }}}
-                                }
-
-    ############################################################
-    #"Code" to identify the True ID for each component
-    ############################################################
-
-    configdict["TrueID"] = {}
-    configdict["TrueID"] = {"Signal"          : 100,
-                            "Bd2DK"           : 200,
-                            "Bd2DRho"         : 300,
-                            "Bd2DstPi"        : 400,
-                            "Bd2DKst"         : 500,
-                            "Combinatorial"   : 600}
-
-    ############################################################
-    #List of PDFs for "time-independent" observables
-    #Dictionary structure: observable->component->bachelor hypo->year->D mode
-    ############################################################
-
-    Pipeak = 5.27849e+03
-    Kpeak = 5.27907e+03
-
-    configdict["PDFList"] = {}
-    configdict["PDFList"]["BeautyMass"] = {}
-
-    #Signal
-    configdict["PDFList"]["BeautyMass"]["Signal"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DPi"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DPi"]["2011"]["KPiPi"] = {"Type"       : "Ipatia",
-                                                                                "mean"       : [Pipeak],
-                                                                                "sigma"      : [1.96756e+01],
-                                                                                "zeta"       : [0.0],
-                                                                                "fb"         : [0.0],
-                                                                                "l"          : [-3.14504e+00],
-                                                                                "a1"         : [1.56363e+00], #left
-                                                                                "a2"         : [1.77887e+00], #right
-                                                                                "n1"         : [4.04491e+00], #left
-                                                                                "n2"         : [6.62043e+00]} #right
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DK"]["2011"]["KPiPi"] = {"Type"       : "Ipatia",
-                                                                               "mean"       : [5.32740e+03],
-                                                                               "sigma"      : [2.42675e+01],
-                                                                               "zeta"       : [0.0],
-                                                                               "fb"         : [0.0],
-                                                                               "l"          : [-5.46421e+00],
-                                                                               "a1"         : [3.04325e+00],
-                                                                               "a2"         : [6.62837e-01],
-                                                                               "n1"         : [6.79609e-02],
-                                                                               "n2"         : [2.09572e+00]}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DPi"]["2012"] = configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DPi"]["2011"]
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DK"]["2012"] = configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DK"]["2011"]
-
-    #Bd2DK
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bd2DPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bd2DPi"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bd2DPi"]["2011"]["KPiPi"] = {"Type"       : "Ipatia",
-                                                                               "mean"       : [5.23938e+03],
-                                                                               "sigma"      : [2.59213e+01],
-                                                                               "zeta"       : [0.0],
-                                                                               "fb"         : [0.0],
-                                                                               "l"          : [-3.98519e+01],
-                                                                               "a1"         : [9.68988e-01],
-                                                                               "a2"         : [1.23156e+00],
-                                                                               "n1"         : [3.49691e+00],
-                                                                               "n2"         : [1.00524e+01]}
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bd2DK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bd2DK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bd2DK"]["2011"]["KPiPi"] = {"Type"       : "Ipatia",
-                                                                              "mean"       : [Kpeak],
-                                                                              "sigma"      : [1.74271e+01],
-                                                                              "zeta"       : [0.0],
-                                                                              "fb"         : [0.0],
-                                                                              "l"          : [-3.22645e+00],
-                                                                              "a1"         : [2.60724e+00],
-                                                                              "a2"         : [1.0e+09],
-                                                                              "n1"         : [1.00877e+00],
-                                                                              "n2"         : [0.0]}
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bd2DPi"]["2012"] = configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bd2DPi"]["2011"]
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bd2DK"]["2012"] = configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bd2DK"]["2011"]
-
-    #Bd2DRho
-    configdict["PDFList"]["BeautyMass"]["Bd2DRho"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DRho"]["Bd2DPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DRho"]["Bd2DPi"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DRho"]["Bd2DPi"]["2011"]["KPiPi"] = {"Type"      : "JohnsonSU",
-                                                                                 "mean"      : [4.71618e+03],
-                                                                                 "sigma"     : [9.01304e+02],
-                                                                                 "nu"        : [-2.01671e+00],
-                                                                                 "tau"       : [1.29155e+00]}
-    configdict["PDFList"]["BeautyMass"]["Bd2DRho"]["Bd2DK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DRho"]["Bd2DK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DRho"]["Bd2DK"]["2011"]["KPiPi"] = {"Type"       : "DoubleGaussian",
-                                                                                "mean"       : [5.14019e+03],
-                                                                                "sigma1"     : [9.00002e+01],
-                                                                                "sigma2"     : [1.55484e+02],
-                                                                                "frac"       : [8.30742e-01]}
-    configdict["PDFList"]["BeautyMass"]["Bd2DRho"]["Bd2DPi"]["2012"] =  configdict["PDFList"]["BeautyMass"]["Bd2DRho"]["Bd2DPi"]["2011"]
-    configdict["PDFList"]["BeautyMass"]["Bd2DRho"]["Bd2DK"]["2012"] = configdict["PDFList"]["BeautyMass"]["Bd2DRho"]["Bd2DK"]["2011"]
-
-    #Bd2DstPi
-    configdict["PDFList"]["BeautyMass"]["Bd2DstPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DstPi"]["Bd2DPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DstPi"]["Bd2DPi"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DstPi"]["Bd2DPi"]["2011"]["KPiPi"] = {"Type"        : "CrystalBallPlusGaussian",
-                                                                                  "mean"        : [5.10033e+03],
-                                                                                  "alpha"       : [-1.63404e+00],
-                                                                                  "n"           : [4.65946e+00],
-                                                                                  "sigmaCB"     : [4.15131e+01],
-                                                                                  "sigmaG"      : [1.79617e+01],
-                                                                                  "fracG"       : [1.32304e-01]}
-    configdict["PDFList"]["BeautyMass"]["Bd2DstPi"]["Bd2DK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DstPi"]["Bd2DK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DstPi"]["Bd2DK"]["2011"]["KPiPi"] = {"Type"        : "None"}
-    configdict["PDFList"]["BeautyMass"]["Bd2DstPi"]["Bd2DPi"]["2012"] = configdict["PDFList"]["BeautyMass"]["Bd2DstPi"]["Bd2DPi"]["2011"]
-    configdict["PDFList"]["BeautyMass"]["Bd2DstPi"]["Bd2DK"]["2012"] = configdict["PDFList"]["BeautyMass"]["Bd2DstPi"]["Bd2DK"]["2011"]
-
-    #Bd2DKst
-    configdict["PDFList"]["BeautyMass"]["Bd2DKst"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DKst"]["Bd2DPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DKst"]["Bd2DPi"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DKst"]["Bd2DPi"]["2011"]["KPiPi"] = {"Type"        : "None"}
-    configdict["PDFList"]["BeautyMass"]["Bd2DKst"]["Bd2DK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DKst"]["Bd2DK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DKst"]["Bd2DK"]["2011"]["KPiPi"] = {"Type"       : "Gaussian",
-                                                                                "mean"       : [5.08528e+03],
-                                                                                "sigma"      : [3.76140e+01]}
-    configdict["PDFList"]["BeautyMass"]["Bd2DKst"]["Bd2DPi"]["2012"] = configdict["PDFList"]["BeautyMass"]["Bd2DKst"]["Bd2DPi"]["2011"]
-    configdict["PDFList"]["BeautyMass"]["Bd2DKst"]["Bd2DK"]["2012"] = configdict["PDFList"]["BeautyMass"]["Bd2DKst"]["Bd2DK"]["2011"]
-
-    #Combinatorial
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"] = {}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bd2DPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bd2DPi"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bd2DPi"]["2011"]["KPiPi"] = {"Type"       : "ExponentialPlusConstant",
-                                                                                       "cB"           : [-5.59102e-03],
-                                                                                       "fracExpo"     : [8.77658e-01]}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bd2DK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bd2DK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bd2DK"]["2011"]["KPiPi"] = {"Type"       : "ExponentialPlusConstant",
-                                                                                      "cB"           : [-4.15525e-03],
-                                                                                      "fracExpo"     : [9.38575e-01]}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bd2DPi"]["2012"] = configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bd2DPi"]["2011"]
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bd2DK"]["2012"] = configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bd2DK"]["2011"]
-
-    ############################################################
-    #Tagging calibration and mistag PDF. If "MistagPDF" : None,
-    #then a average mistag is used
-    ############################################################
-
-    configdict["Taggers"] = {}
-    for comp in configdict["Components"].keys():
-        configdict["Taggers"][comp] = {}
-        configdict["Taggers"][comp] = {"OS" : #From Bu, stat and syst combined
-                                       {"Calibration":
-                                        {"p0"       : [0.3737056],
-                                         "p1"       : [1.028621],
-                                         "deltap0"  : [0.011819],
-                                         "deltap1"  : [0.043134],
-                                         "avgeta"   : [0.347742], #<eta> on spline-corrected Bu->D0Pi
-                                         "tageff"   : [0.371], # the correct value here is 0.371
-                                         "tagasymm" : [0.0]
-                                         },
-                                        "MistagPDF" :
-                                        {"Type"       : "FromWorkspace",
-                                         "File"       : "root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MistagTemplates/templates_mistag.root",
-                                         "Workspace"  : "workspace",
-                                         "Name"       : "sigMistagPdf_2"
-                                         }
-                                        },
-                                       "SS": #From JpsiKst, stat and syst combined
-                                       {"Calibration":
-                                        {"p0"       : [0.4424049],
-                                         "p1"       : [0.81302],
-                                         "deltap0"  : [0.00062332],
-                                         "deltap1"  : [0.0066248],
-                                         "avgeta"   : [0.435], #<eta> on Bd->J/psiK*
-                                         "tageff"   : [0.816], # the correct value here is 0.816
-                                         "tagasymm" : [0.0]
-                                         },
-                                        "MistagPDF" :
-                                        {"Type"       : "FromWorkspace",
-                                         "File"       : "root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MistagTemplates/templates_mistag.root",
-                                         "Workspace"  : "workspace",
-                                         "Name"       : "sigMistagPdf_1"
-                                         }
-                                        }
-                                       }
-
-    ############################################################
-    #Time resolution and acceptance (there is a single dict because
-    #they are strongly connected in the way they are built).
-    #If "TimeErrorPDF" : None, then an average resolution model
-    #is used.
-    ############################################################
-
-    configdict["ResolutionAcceptance"] = {}
-    for comp in configdict["Components"].keys():
-        configdict["ResolutionAcceptance"][comp] = {}
-        configdict["ResolutionAcceptance"][comp] = {"TimeErrorPDF": None,
-                                                    "Acceptance":  #From ANA note v2
-                                                    {"Type": "Spline",
-                                                     "KnotPositions" : [ 0.5, 1.0, 1.5, 2.0, 3.0, 12.0 ],
-                                                     "KnotCoefficients" : [ 0.3889, 0.5754, 0.8515, 1.0649, 1.2373, 1.4149]},
-                                                    "Resolution": #From ANA note v2
-                                                    {"Type": "AverageModel",
-                                                     "Parameters": { 'sigmas': [ 0.05491 ], 'fractions': [] },
-                                                     "Bias": [0.0],
-                                                     "ScaleFactor": [1.0]}
-                                                    }
-
-    ############################################################
-    #Production and detection asymmetries
-    ############################################################
-
-    configdict["ProductionAsymmetry"] = {}
-    configdict["DetectionAsymmetry"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = {}
-    configdict["DetectionAsymmetry"]["Signal"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = [-0.0124] #from ANA note v2
-    configdict["DetectionAsymmetry"]["Signal"] = [0.0086] #from arXiv:1408.0275v2 (OPPOSITE SIGN!!!)
-    for comp in configdict["Components"].keys():
-        if comp != "Signal":
-            #We don't really care about background
-            configdict["ProductionAsymmetry"][comp] = {}
-            configdict["DetectionAsymmetry"][comp] = {}
-            configdict["ProductionAsymmetry"][comp] = [0.0]
-            configdict["DetectionAsymmetry"][comp] = [0.0]
-
-    ############################################################
-    #Time PDF parameters
-    ############################################################
-
-    configdict["ACP"] = {}
-
-    #Parameters from https://svnweb.cern.ch/trac/lhcb/browser/DBASE/tags/Gen/DecFiles/v27r42/dkfiles/Bd_D-pi+,Kpipi=CPVDDalitz,DecProdCut.dec)
-    ModqOverp_d     =  1
-    ArgqOverp_d     =  -0.746
-    ModpOverq_d     =  1
-    ArgpOverq_d     =  0.746
-    ModAf_d         =  0.0849
-    ArgAf_d         =  0.002278
-    ModAbarf_d      =  0.00137
-    ArgAbarf_d      =  -1.128958
-    ModAfbar_d      =  0.00137
-    ArgAfbar_d      =  1.3145
-    ModAbarfbar_d   =  0.0849
-    ArgAbarfbar_d   =  0.002278
-
-    #Signal (use more convenient interface with ArgLf_d, ArgLbarfbar_d and ModLf_d)
-    configdict["ACP"]["Signal"] = { "Gamma"                : [1.0 / 1.520], #Inverse lifetime from HFAG (http://www.slac.stanford.edu/xorg/hfag/osc/summer_2016/)
-                                    "DeltaGamma"           : [0.0],
-                                    "DeltaM"               : [0.5050], #semileptonic measurement HFAG (http://www.slac.stanford.edu/xorg/hfag/osc/summer_2016/)
-                                    #"ArgLf"                : [ArgqOverp_d + ArgAbarf_d - ArgAf_d],
-                                    #"ArgLbarfbar"          : [ArgpOverq_d + ArgAfbar_d - ArgAbarfbar_d],
-                                    #"ModLf"                : [ModAbarf_d/ModAf_d],
-                                    "C"                    : [1.0], #we neglect r^2 terms
-                                    "S"                    : [-0.031], #from decfile
-                                    "Sbar"                 : [0.029], #from decfile
-                                    "D"                    : [0], #from DeltaGamma=0
-                                    "Dbar"                 : [0], #from DeltaGamma=0
-                                    "ParameteriseIntegral" : True,
-                                    "NBinsAcceptance"      : 0} #keep at zero if using spline acceptance!
-
-    for comp in configdict["Components"].keys():
-        if comp != "Signal":
-            #Use other interface with C, S, Sbar, D, Dbar
-            #We build trivial PDFs since we don't care about background shapes in time if we use sWeights
-            configdict["ACP"][comp] = { "Gamma"                 : [1.0],
-                                        "DeltaGamma"            : [0.0],
-                                        "DeltaM"                : [0.0],
-                                        "C"                     : [0.0],
-                                        "S"                     : [0.0],
-                                        "Sbar"                  : [0.0],
-                                        "D"                     : [0.0],
-                                        "Dbar"                  : [0.0],
-                                        "ParameteriseIntegral"  : True,
-                                        "NBinsAcceptance"       : 0}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForToysGeneration_SignalOnly.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForToysGeneration_SignalOnly.py
deleted file mode 100644
index 6712bacd8b0f306cd918acd845913d108c094af8..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForToysGeneration_SignalOnly.py
+++ /dev/null
@@ -1,263 +0,0 @@
-"""configuration file for toy generation for signal only toys"""
-from __future__ import division
-from past.utils import old_div
-def getconfig():
-
-    configdict = {}
-
-    ############################################################
-    # List of observables for all the PDFs.
-    # The content of this dictionary determines the observables
-    # to generate for and how may taggers are present.
-    ############################################################
-
-    configdict["Observables"] = {}
-    configdict["Observables"] = {"BeautyMass": {"Type": "RooRealVar",
-                                                "Title": "B mass (MeV/c^2)",
-                                                "Range": [5090, 6000]},
-                                 "BeautyTime": {"Type": "RooRealVar",
-                                                "Title": "B decay time (ps)",
-                                                "Range": [0.4, 15.0]},
-                                 "BacCharge": {"Type": "RooCategory",
-                                               "Title": "Bachelor charge",
-                                               "Categories": {"h+": +1}},
-                                 "BacCharge": {"Type": "RooCategory",
-                                               "Title": "Bachelor charge",
-                                               "Categories": {"h+": +1,
-                                                              "h-": -1}},
-                                 "MistagOS": {"Type": "RooRealVar",
-                                              "Title": "#eta_{OS}",
-                                              "Range": [0.0, 0.5]},
-                                 "MistagSS": {"Type": "RooRealVar",
-                                              "Title": "#eta_{SS}",
-                                              "Range": [0.0, 0.5]},
-                                 "TrueID": {"Type": "RooRealVar",
-                                            "Title": "True component ID",
-                                            "Range": [0.0, 1500.0]},
-                                 "TagDecOS": {"Type": "RooCategory",
-                                              "Title": "q_{t}^{OS}",
-                                              "Categories": {"B": +1,
-                                                             "Untagged": 0,
-                                                             "Bbar": -1}},
-                                 "TagDecSS": {"Type": "RooCategory",
-                                              "Title": "q_{t}^{SS}",
-                                              "Categories": {"B": +1,
-                                                             "Untagged": 0,
-                                                             "Bbar": -1}}
-                                 }
-
-    ############################################################
-    # List of mass hypotheses for bachelor
-    # The content of this dictionary determines how many
-    # bachelor PID bins the final dataset is splitted into
-    ############################################################
-
-    configdict["Hypothesys"] = ["Bd2DPi"]
-
-    ############################################################
-    # Signal decay and Charm decay mode
-    ############################################################
-
-    configdict["Decay"] = "Bd2DPi"
-    configdict["CharmModes"] = ["KPiPi"]
-    configdict["Years"] = ["2011", "2012"]
-    configdict["MergedYears"] = True
-
-    ############################################################
-    # Luminosity for splitting yields and other parameters
-    ############################################################
-
-    configdict["IntegratedLuminosity"] = {"2011": {"Down": 0.50, "Up": 0.50}, "2012": {"Down": 1.000, "Up": 1.000}}
-    lum2011 = configdict["IntegratedLuminosity"]["2011"]["Up"] + configdict["IntegratedLuminosity"]["2011"]["Down"]
-    lum2012 = configdict["IntegratedLuminosity"]["2012"]["Up"] + configdict["IntegratedLuminosity"]["2012"]["Down"]
-    fracRun1 = old_div(lum2011, (lum2011 + lum2012))
-    DRho_to_DKst_KHypo = 8.5000e-01
-    eff_Bd2DK_DK = 6.29009e-01
-    eff_Bd2DPi_DPi = 9.78927e-01
-
-    ############################################################
-    # List of components with yields to generate.
-    # The content of this dictionary determines, for each
-    # PID bin, how many PDF components are generated.
-    # If there is only signal, a TTree ready for sFit is
-    # generated directly, without need for doing a (useless)
-    # mass fit.
-    ############################################################
-
-    # number of events for Bd2Dpi: 5.2848e+05
-    # number of events for Bd2JpsieeKS: 10628
-
-    configdict["Components"] = {}
-    configdict["Components"] = {"Signal": {"Bd2DPi": {"2011": {"KPiPi": [5.2848e+05 * fracRun1]},
-                                                      "2012": {"KPiPi": [5.2848e+05 * (1 - fracRun1)]}}}
-                                }
-
-    ############################################################
-    # "Code" to identify the True ID for each component
-    ############################################################
-
-    configdict["TrueID"] = {}
-    configdict["TrueID"] = {"Signal": 100}
-
-    ############################################################
-    # List of PDFs for "time-independent" observables
-    # Dictionary structure: observable->component->bachelor hypo->year->D mode
-    ############################################################
-
-    Pipeak = 5.27849e+03
-
-    configdict["PDFList"] = {}
-    configdict["PDFList"]["BeautyMass"] = {}
-
-    # Signal
-    configdict["PDFList"]["BeautyMass"]["Signal"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DPi"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DPi"]["2011"]["KPiPi"] = {"Type": "Ipatia",
-                                                                                "mean": [Pipeak],
-                                                                                "sigma": [1.96756e+01],
-                                                                                "zeta": [0.0],
-                                                                                "fb": [0.0],
-                                                                                "l": [-3.14504e+00],
-                                                                                "a1": [1.56363e+00],  # left
-                                                                                "a2": [1.77887e+00],  # right
-                                                                                "n1": [4.04491e+00],  # left
-                                                                                "n2": [6.62043e+00]}  # right
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DPi"]["2012"] = configdict["PDFList"]["BeautyMass"]["Signal"]["Bd2DPi"]["2011"]
-
-    ############################################################
-    # Tagging calibration and mistag PDF. If "MistagPDF" : None,
-    # then a average mistag is used
-    ############################################################
-
-    configdict["Taggers"] = {}
-    for comp in configdict["Components"].keys():
-        configdict["Taggers"][comp] = {}
-        configdict["Taggers"][comp] = {"OS":
-                                       {"Calibration":
-                                        {"p0": [0.3737056],
-                                         "p1": [1.028621],
-                                         "deltap0": [0.11819],  # 0.011819
-                                         "deltap1": [0.143134],  # 0.043134
-                                         "avgeta": [0.347742],
-                                         "tageff": [0.371],
-                                         "tagasymm": [0.0]
-                                         },
-                                        "MistagPDF":
-                                        {"Type": "FromWorkspace",  # options: Gauss, FromWorkspace
-                                         "File": "/fhgfs/users/abirnkraut/MistagTemplates/MistagTemplates_Dpi_OSuncut.root",
-                                         "Workspace": "workspace",
-                                         "Name": "sigMistagPdf_2"
-                                         # "mean": [0.32, 0.25, 0.5],
-                                         # "sigma": [0.04, 0.0, 0.2]
-                                         }
-                                        },
-                                       "SS":
-                                       {"Calibration":
-                                        {"p0": [0.4424049],
-                                         "p1": [0.81302],
-                                         "deltap0": [0.162332],  # 00062332
-                                         "deltap1": [-0.1066248],  # 0.0066248
-                                         "avgeta": [0.435],
-                                         "tageff": [0.816],
-                                         "tagasymm": [0.0]
-                                         },
-                                        "MistagPDF":
-                                        {"Type": "FromWorkspace",  # options: Gauss, FromWorkspace
-                                         "File": "/fhgfs/users/abirnkraut/MistagTemplates/MistagTemplates_Dpi.root",
-                                         "Workspace": "workspace",
-                                         "Name": "sigMistagPdf_1"
-                                         # "mean": [0.47, 0.25, 0.5],
-                                         # "sigma": [0.02, 0.0, 0.2]
-                                         }
-                                        }
-                                       }
-
-    ############################################################
-    # Time resolution and acceptance (there is a single dict because
-    # they are strongly connected in the way they are built).
-    # If "TimeErrorPDF" : None, then an average resolution model
-    # is used.
-    ############################################################
-
-    configdict["ResolutionAcceptance"] = {}
-    for comp in configdict["Components"].keys():
-        configdict["ResolutionAcceptance"][comp] = {}
-        configdict["ResolutionAcceptance"][comp] = {"TimeErrorPDF": None,
-                                                    "Acceptance":  # From ANA note v2
-                                                    {"Type": "Spline",
-                                                     "KnotPositions": [0.5, 1.0, 1.5, 2.0, 3.0, 12.0],
-                                                     "KnotCoefficients": [0.3889, 0.5754, 0.8515, 1.0649, 1.2373, 1.4149]},
-                                                    "Resolution":  # From ANA note v2
-                                                    {"Type": "AverageModel",
-                                                     "Parameters": {'sigmas': [0.05491], 'fractions': []},
-                                                     "Bias": [0.0],
-                                                     "ScaleFactor": [1.0]}
-                                                    }
-
-    ############################################################
-    # Production and detection asymmetries
-    ############################################################
-
-    configdict["ProductionAsymmetry"] = {}
-    configdict["DetectionAsymmetry"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = {}
-    configdict["DetectionAsymmetry"]["Signal"] = {}
-    configdict["ProductionAsymmetry"]["Signal"] = [-0.0124]  # from ANA note v2
-    configdict["DetectionAsymmetry"]["Signal"] = [0.0086]  # from arXiv:1408.0275v2 (OPPOSITE SIGN!!!)
-    # configdict["DetectionAsymmetry"]["Signal"] = [0.0]  # sin2beta with only one bacCharge category
-
-    ############################################################
-    # Time PDF parameters
-    ############################################################
-
-    configdict["ACP"] = {}
-
-    # Parameters from https://svnweb.cern.ch/trac/lhcb/browser/DBASE/tags/Gen/DecFiles/v27r42/dkfiles/Bd_D-pi+,Kpipi=CPVDDalitz,DecProdCut.dec)
-    ModqOverp_d     = 1
-    ArgqOverp_d     = -0.746
-    ModpOverq_d     = 1
-    ArgpOverq_d     = 0.746
-    ModAf_d         = 0.0849
-    ArgAf_d         = 0.002278
-    ModAbarf_d      = 0.00137
-    ArgAbarf_d      = -1.128958
-    ModAfbar_d      = 0.00137
-    ArgAfbar_d      = 1.3145
-    ModAbarfbar_d   = 0.0849
-    ArgAbarfbar_d   = 0.002278
-
-    # Signal (use more convenient interface with ArgLf_d, ArgLbarfbar_d and ModLf_d)
-    configdict["ACP"]["Signal"] = {"Gamma": [1.0 / 1.520],  # Inverse lifetime from HFAG (http://www.slac.stanford.edu/xorg/hfag/osc/summer_2016/)
-                                   "DeltaGamma": [0.0],
-                                   "DeltaM": [0.5050],  # semileptonic measurement HFAG (http://www.slac.stanford.edu/xorg/hfag/osc/summer_2016/)
-                                   "ArgLf": [ArgqOverp_d + ArgAbarf_d - ArgAf_d],
-                                   "ArgLbarfbar": [ArgpOverq_d + ArgAfbar_d - ArgAbarfbar_d],  # ArgpOverq_d = -ArgqOverp_d
-                                   "ModLf": [old_div(ModAbarf_d, ModAf_d)],
-                                   # "C": [0.0],  # sin2beta
-                                   # "S": [0.7],  # sin2beta
-                                   # "Sbar": [0.0],  # sin2beta
-                                   # "C": [1.0], #we neglect r^2 terms
-                                   # "S": [-0.031], #from decfile
-                                   # "Sbar": [0.029], #from decfile
-                                   "D": [0],  # from DeltaGamma=0
-                                   "Dbar": [0],  # from DeltaGamma=0
-                                   "ParameteriseIntegral": True,
-                                   "NBinsAcceptance": 0}  # keep at zero if using spline acceptance!
-
-    for comp in configdict["Components"].keys():
-        if comp != "Signal":
-            # Use other interface with C, S, Sbar, D, Dbar
-            # We build trivial PDFs since we don't care about background shapes in time if we use sWeights
-            configdict["ACP"][comp] = {"Gamma": [1.0],
-                                       "DeltaGamma": [0.0],
-                                       "DeltaM": [0.0],
-                                       "C": [0.0],
-                                       "S": [0.0],
-                                       "Sbar": [0.0],
-                                       "D": [0.0],
-                                       "Dbar": [0.0],
-                                       "ParameteriseIntegral": True,
-                                       "NBinsAcceptance": 0}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_KHypo.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_KHypo.py
deleted file mode 100644
index b8e9d91a63ca9485940bb120452ee2e4a8e79ad7..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_KHypo.py
+++ /dev/null
@@ -1,96 +0,0 @@
-from __future__ import division
-from past.utils import old_div
-from ROOT import *
-
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bd2DPi"
-    configdict["Hypothesis"] = "Bd2DK"
-    configdict["CharmModes"] = {"KPiPi"} 
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2012"} 
-    # stripping (necessary in case of PIDK shapes)
-    configdict["Stripping"] = {"2012":"21"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes) 
-    configdict["IntegratedLuminosity"] = {"2012": {"Down": 0.59, "Up": 0.44}}
-    configdict["LumRatio"] = {"2012" :
-                              old_div(configdict["IntegratedLuminosity"]["2012"]["Up"], ( configdict["IntegratedLuminosity"]["2012"]["Up"] + configdict["IntegratedLuminosity"]["2012"]["Down"] )) }
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "../data/Bd2DPi_3fbCPV/Bd2DPi/config_Bd2DPi.txt"
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5000,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_M_flat"}
-
-    configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1910    ],
-                                                      "Name"                   : "CharmMass",
-                                                      "InputName"              : "lab2_MM"}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.2,     15.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_ctau_flat"}
-    
-    configdict["BasicVariables"]["BacP"]          = { "Range"                  : [3000.0,  650000.0],
-                                                      "Name"                   : "BacP",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_P0_P_flat"}
-
-    configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-                                                      "Name"                   : "BacPT",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_P0_PT_flat"}
-
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [1.61,    5.0     ],
-                                                      "Name"                   : "BacPIDK",
-                                                      "InputName"              : "lab1_PIDK"}
-
-    configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-                                                      "Name"                   : "nTracks",
-                                                      "InputName"              : "nTracks"}
-
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range"                  : [0.01,    0.1     ],
-                                                      "Name"                   : "BeautyTimeErr",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_ctauErr_flat"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_ID"}
-
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecOS",
-                                                      "InputName"              : "obsTagOS"}
-
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecSS",
-                                                      "InputName"              : "obsTagSSPionBDT"} 
-
-    configdict["BasicVariables"]["MistagOS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagOS",
-                                                      "InputName"              : "obsEtaOS"}
-
-    configdict["BasicVariables"]["MistagSS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagSS",
-                                                      "InputName"              : "obsEtaSSPionBDT"}
-    
-    # tagging calibration
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"]    = {"p0"   : 0.365517, "p1"   : 0.950216, "average"   : 0.371147,
-                                                 "p0Bar": 0.376730, "p1Bar": 1.048155, "averageBar": 0.371147}
-    configdict["TaggingCalibration"]["SS"]    = {"p0"   : 0.424801, "p1"   : 1.004340, "average"   : 0.414892,
-                                                 "p0Bar": 0.404896, "p1Bar": 0.995879, "averageBar": 0.414892}
-    configdict["TaggingCalibration"]["OS+SS"] = {"p0"   : 0.338781, "p1"   : 0.971845, "average"   : 0.338493,
-                                                 "p0Bar": 0.338363, "p1Bar": 1.027861, "averageBar": 0.338493}
-
-    # PrefixID
-    configdict["DsChildrenPrefix"] = { "Child1"   :"lab3",
-                                       "Child2"   :"lab4",
-                                       "Child3"   :"lab5"}
-                                    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_KHypo_Data.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_KHypo_Data.py
deleted file mode 100644
index af46506d1472cf34097ab61faa55d4a7d8be2b41..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_KHypo_Data.py
+++ /dev/null
@@ -1,135 +0,0 @@
-from ROOT import *
-
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bd2DPi"
-    # PIDK for bachelor
-    configdict["BachelorHypo"] = "Bd2DK"
-    configdict["CharmModes"] = {"KPiPi"} 
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2011","2012"} 
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "/afs/cern.ch/user/v/vibattis/cmtuser/UraniaDev_v6r2p1/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/config_Bd2DPi.txt"
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5090,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersConst_M_flat"}
-
-    configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1904    ],
-                                                      "Name"                   : "CharmMass",
-                                                      "InputName"              : "lab0_FitwithoutConst_Dplus_M_flat"}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.4,     12.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "obsTime"}
-    
-    configdict["BasicVariables"]["BacP"]          = { "Range"                  : [2000.0,  650000.0],
-                                                      "Name"                   : "BacP",
-                                                      "InputName"              : "lab0_FitDaughtersConst_P0_P_flat"}
-
-    configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-                                                      "Name"                   : "BacPT",
-                                                      "InputName"              : "lab0_FitDaughtersConst_P0_PT_flat"}
-
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0,    999.0     ],
-                                                      "Name"                   : "BacPIDK",
-                                                      "InputName"              : "lab1_PIDK"}
-    
-    configdict["BasicVariables"]["TagDecOSComb"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                          "Name"                   : "TagDecOSComb",
-                                                          "InputName"              : "obsTagOS"}
-
-    configdict["BasicVariables"]["TagDecOSCharm"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                           "Name"                   : "TagDecOSCharm",
-                                                           "InputName"              : "obsTagOSCharm"}
-    
-    configdict["BasicVariables"]["TagDecSSPionBDTRaw"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                                "Name"                   : "TagDecSSPionBDT",
-                                                                "InputName"              : "lab0_SS_nnetKaon_DEC"}
-
-    configdict["BasicVariables"]["TagDecSSProtonRaw"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                               "Name"                   : "TagDecSSProton",
-                                                               "InputName"              : "lab0_OS_nnetKaon_DEC"}
-
-    configdict["BasicVariables"]["MistagOSComb"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                          "Name"                   : "MistagOSComb",
-                                                          "InputName"              : "obsEtaOS"}
-
-    configdict["BasicVariables"]["MistagOSCharm"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                           "Name"                   : "MistagOSCharm",
-                                                           "InputName"              : "obsEtaOSCharm"}
-
-    configdict["BasicVariables"]["MistagSSPionBDTRaw"]      = { "Range"                  : [ -1.0,    1.0     ],
-                                                                "Name"                   : "MistagSSPionBDTRaw",
-                                                                "InputName"              : "lab0_SS_nnetKaon_PROB"}
-
-    configdict["BasicVariables"]["MistagSSProtonRaw"]      = { "Range"                  : [ -1.0,    1.0     ],
-                                                               "Name"                   : "MistagSSProtonRaw",
-                                                               "InputName"              : "lab0_OS_nnetKaon_PROB"}
-
-    configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-                                                      "Name"                   : "nTracks",
-                                                      "InputName"              : "nTracks"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_ID"}
-
-    configdict["BasicVariables"]["BDTG"]           = { "Range"                  : [0.0, 1],
-                                                       "Name"                   : "BDTG",
-                                                       "InputName"              : "BDT_classifier"}
-
-    #Additional variables not foreseen before
-    configdict["AdditionalVariables"] = {}
-    
-    configdict["AdditionalVariables"]["BeautyPhi"]      = { "Range"                  : [ -10.,    10.     ],
-                                                            "Name"                   : "BeautyPhi",
-                                                            "InputName"              : "lab0_LOKI_PHI"}
-    
-    configdict["AdditionalVariables"]["BeautyEta"]      = { "Range"                  : [ 1.5,    10.0     ],
-                                                            "Name"                   : "BeautyEta",
-                                                            "InputName"              : "lab0_LOKI_ETA"}
-    
-    configdict["AdditionalVariables"]["BeautyPT"]      = { "Range"                  : [ 0.0,    100000     ],
-                                                           "Name"                   : "BeautyPT",
-                                                           "InputName"              : "lab0_PT"}
-
-    configdict["AdditionalVariables"]["BeautyP"]      = { "Range"                  : [ 0.0,    3000000     ],
-                                                          "Name"                   : "BeautyP",
-                                                          "InputName"              : "lab0_P"}
-
-    configdict["AdditionalVariables"]["CharmTime"]    = { "Range"                  : [-10,     10    ],
-                                                          "Name"                   : "CharmTime",
-                                                          "InputName"              : "lab2_TAU"}
-    
-    configdict["AdditionalVariables"]["nPV"]      = { "Range"                  : [ 0.0,    10     ],
-                                                      "Name"                   : "nPV",
-                                                      "InputName"              : "nPV"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo2BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo2BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo2BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo3BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo3BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo3BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo4BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo4BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo4BodyBBDTDecision_TOS"}
-    
-
-    # PIDK bin
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"] = {"Data": "lab1_PIDK>5.0 && (obsTagOS!=0 || obsTagOSCharm!=0 || lab0_OS_nnetKaon_DEC !=0 || lab0_SS_nnetKaon_DEC!=0) && BDT_classifier>0.0 && obsTime>0.4 && obsTime<12.0 && lab0_FitDaughtersConst_M_flat>5090.0 && lab0_FitDaughtersConst_M_flat<6000.0 && nTracks>15 && nTracks<1000 && lab0_FitwithoutConst_Dplus_M_flat>1830 && lab0_FitwithoutConst_Dplus_M_flat<1904 && lab0_FitDaughtersConst_P0_P_flat>2000 && lab0_FitDaughtersConst_P0_P_flat<650000 && lab0_FitDaughtersConst_P0_PT_flat>400 && lab0_FitDaughtersConst_P0_PT_flat<45000 && lab0_LOKI_PHI>-10 && lab0_LOKI_PHI<10 && lab0_LOKI_ETA>1.5 && lab0_LOKI_ETA<10 && lab0_P>0 && lab0_P<3000000 && lab0_PT>0 && lab0_PT<100000"}
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_KHypo_MC.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_KHypo_MC.py
deleted file mode 100644
index ca575c470cd92b4c65b874a6c2c7613cdeb34c82..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_KHypo_MC.py
+++ /dev/null
@@ -1,102 +0,0 @@
-from ROOT import *
-
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bd2DPi"
-    # PIDK for bachelor
-    configdict["BachelorHypo"] = "Bd2DK"
-    configdict["CharmModes"] = {"KPiPi"} 
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2012"} 
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "/afs/cern.ch/user/v/vibattis/cmtuser/UraniaDev_v6r2p1/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/config_Bd2DPi.txt"
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5090,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersConst_M_flat"}
-
-    configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1904    ],
-                                                      "Name"                   : "CharmMass",
-                                                      "InputName"              : "lab0_FitwithoutConst_Dplus_M_flat"}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.4,     12.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "obsTime"}
-    
-    configdict["BasicVariables"]["BacP"]          = { "Range"                  : [2000.0,  650000.0],
-                                                      "Name"                   : "BacP",
-                                                      "InputName"              : "lab0_FitDaughtersConst_P0_P_flat"}
-
-    configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-                                                      "Name"                   : "BacPT",
-                                                      "InputName"              : "lab0_FitDaughtersConst_P0_PT_flat"}
-
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0,    999.0     ],
-                                                      "Name"                   : "BacPIDK",
-                                                      "InputName"              : "lab1_PIDKcorr"}
-
-    configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-                                                      "Name"                   : "nTracks",
-                                                      "InputName"              : "nTracks"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_TRUEID"}
-    
-    configdict["BasicVariables"]["BDTG"]           = { "Range"                  : [0.0, 1],
-                                                       "Name"                   : "BDTG",
-                                                       "InputName"              : "BDT_classifier"}
-
-    #Additional variables not foreseen before
-    configdict["AdditionalVariables"] = {}
-    
-    configdict["AdditionalVariables"]["BeautyPhi"]      = { "Range"                  : [ -10.,    10.     ],
-                                                            "Name"                   : "BeautyPhi",
-                                                            "InputName"              : "lab0_LOKI_PHI"}
-    
-    configdict["AdditionalVariables"]["BeautyEta"]      = { "Range"                  : [ 1.5,    10.0     ],
-                                                            "Name"                   : "BeautyEta",
-                                                            "InputName"              : "lab0_LOKI_ETA"}
-    
-    configdict["AdditionalVariables"]["BeautyPT"]      = { "Range"                  : [ 0.0,    100000     ],
-                                                           "Name"                   : "BeautyPT",
-                                                           "InputName"              : "lab0_PT"}
-
-    configdict["AdditionalVariables"]["BeautyP"]      = { "Range"                  : [ 0.0,    3000000     ],
-                                                          "Name"                   : "BeautyP",
-                                                          "InputName"              : "lab0_P"}
-
-    configdict["AdditionalVariables"]["CharmTime"]    = { "Range"                  : [-10,     10    ],
-                                                          "Name"                   : "CharmTime",
-                                                          "InputName"              : "lab2_TAU"}
-    
-    configdict["AdditionalVariables"]["nPV"]      = { "Range"                  : [ 0.0,    10     ],
-                                                      "Name"                   : "nPV",
-                                                      "InputName"              : "nPV"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo2BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo2BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo2BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo3BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo3BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo3BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo4BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo4BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo4BodyBBDTDecision_TOS"}
-
-    # PIDK bin
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"] = {"MC": "lab0_BKGCAT<60 && (obsTagOS!=0 || obsTagOSCharm!=0 || obsTagSSPionBDT!=0 || obsTagSSProton!=0) && BDT_classifier>0.0 && obsTime>0.4 && obsTime<12.0 && lab1_PIDKcorr>5.0 && lab0_FitDaughtersConst_M_flat>5090.0 && lab0_FitDaughtersConst_M_flat<6000.0 && nTracks>15 && nTracks<1000 && lab0_FitwithoutConst_Dplus_M_flat>1830 && lab0_FitwithoutConst_Dplus_M_flat<1904 && lab0_FitDaughtersConst_P0_P_flat>2000 && lab0_FitDaughtersConst_P0_P_flat<650000 && lab0_FitDaughtersConst_P0_PT_flat>400 && lab0_FitDaughtersConst_P0_PT_flat<45000 && lab0_LOKI_PHI>-10 && lab0_LOKI_PHI<10 && lab0_LOKI_ETA>1.5 && lab0_LOKI_ETA<10 && lab0_P>0 && lab0_P<3000000 && lab0_PT>0 && lab0_PT<100000"}
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_PiHypo.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_PiHypo.py
deleted file mode 100644
index bab0826fdfc45b09901f2277d03dd0567490e553..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_PiHypo.py
+++ /dev/null
@@ -1,97 +0,0 @@
-from __future__ import division
-from past.utils import old_div
-from ROOT import *
-
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bd2DPi"
-    configdict["Hypothesis"] = "Bd2DPi"
-    configdict["CharmModes"] = {"KPiPi"} 
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2012"} 
-    # stripping (necessary in case of PIDK shapes)
-    configdict["Stripping"] = {"2012":"21"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes) 
-    configdict["IntegratedLuminosity"] = {"2012": {"Down": 0.59, "Up": 0.44}}
-    configdict["LumRatio"] = {"2012" :
-                              old_div(configdict["IntegratedLuminosity"]["2012"]["Up"], ( configdict["IntegratedLuminosity"]["2012"]["Up"] + configdict["IntegratedLuminosity"]["2012"]["Down"] )) }
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "../data/Bd2DPi_3fbCPV/Bd2DPi/config_Bd2DPi.txt"
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5000,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_M_flat"}
-
-    configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1910    ],
-                                                      "Name"                   : "CharmMass",
-                                                      "InputName"              : "obsMassDminus"}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.2,     15.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_ctau_flat"}
-    
-    configdict["BasicVariables"]["BacP"]          = { "Range"                  : [3000.0,  650000.0],
-                                                      "Name"                   : "BacP",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_P0_P_flat"}
-
-    configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-                                                      "Name"                   : "BacPT",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_P0_PT_flat"}
-
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [1.61,    5.0     ],
-                                                      "Name"                   : "BacPIDK",
-                                                      "InputName"              : "lab1_PIDK"}
-
-    configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-                                                      "Name"                   : "nTracks",
-                                                      "InputName"              : "nTracks"}
-
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range"                  : [0.01,    0.1     ],
-                                                      "Name"                   : "BeautyTimeErr",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_ctauErr_flat"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_ID"}
-
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecOS",
-                                                      "InputName"              : "obsTagOS"}
-
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecSS",
-                                                      "InputName"              : "obsTagSSPionBDT"} 
-
-    configdict["BasicVariables"]["MistagOS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagOS",
-                                                      "InputName"              : "obsEtaOS"}
-
-    configdict["BasicVariables"]["MistagSS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagSS",
-                                                      "InputName"              : "obsEtaSSPionBDT"}
-
-    # tagging calibration
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"]    = {"p0"   : 0.365517, "p1"   : 0.950216, "average"   : 0.371147,
-                                                 "p0Bar": 0.376730, "p1Bar": 1.048155, "averageBar": 0.371147}
-    configdict["TaggingCalibration"]["SS"]    = {"p0"   : 0.424801, "p1"   : 1.004340, "average"   : 0.414892,
-                                                 "p0Bar": 0.404896, "p1Bar": 0.995879, "averageBar": 0.414892}
-    configdict["TaggingCalibration"]["OS+SS"] = {"p0"   : 0.338781, "p1"   : 0.971845, "average"   : 0.338493,
-                                                 "p0Bar": 0.338363, "p1Bar": 1.027861, "averageBar": 0.338493}
-    
-
-    # PrefixID
-    configdict["DsChildrenPrefix"] = { "Child1"   : "lab3",
-                                       "Child2"   : "lab4",
-                                       "Child3"   : "lab5"}
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_PiHypo_Data.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_PiHypo_Data.py
deleted file mode 100644
index 190c1e77cc8452eb8d42439d7b6a3a1e9869efc7..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_PiHypo_Data.py
+++ /dev/null
@@ -1,139 +0,0 @@
-from ROOT import *
-
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bd2DPi"
-    # PIDK for bachelor
-    configdict["BachelorHypo"] = "Bd2DPi"
-    configdict["CharmModes"] = {"KPiPi"} 
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2011","2012"} 
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "/afs/cern.ch/user/v/vibattis/cmtuser/UraniaDev_v6r2p1/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/config_Bd2DPi.txt"
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5090,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersConst_M_flat"}
-
-    configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1904    ],
-                                                      "Name"                   : "CharmMass",
-                                                      "InputName"              : "lab0_FitwithoutConst_Dplus_M_flat"}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.4,     12.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "obsTime"}
-    
-    configdict["BasicVariables"]["BacP"]          = { "Range"                  : [2000.0,  650000.0],
-                                                      "Name"                   : "BacP",
-                                                      "InputName"              : "lab0_FitDaughtersConst_P0_P_flat"}
-
-    configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-                                                      "Name"                   : "BacPT",
-                                                      "InputName"              : "lab0_FitDaughtersConst_P0_PT_flat"}
-
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0,    999.0     ],
-                                                      "Name"                   : "BacPIDK",
-                                                      "InputName"              : "lab1_PIDK"}
-
-    configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-                                                      "Name"                   : "nTracks",
-                                                      "InputName"              : "nTracks"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_ID"}
-
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecOS",
-                                                      "InputName"              : "TagDecOS"}
-
-    configdict["BasicVariables"]["TagDecOSComb"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                          "Name"                   : "TagDecOSComb",
-                                                          "InputName"              : "obsTagOS"}
-
-    configdict["BasicVariables"]["TagDecOSCharm"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                           "Name"                   : "TagDecOSCharm",
-                                                           "InputName"              : "obsTagOSCharm"}
-
-    configdict["BasicVariables"]["TagDecSSPionBDTRaw"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                             "Name"                   : "TagDecSSPionBDT",
-                                                             "InputName"              : "lab0_SS_nnetKaon_DEC"}
-
-    configdict["BasicVariables"]["TagDecSSProtonRaw"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                            "Name"                   : "TagDecSSProton",
-                                                            "InputName"              : "lab0_OS_nnetKaon_DEC"}
-    
-    configdict["BasicVariables"]["MistagOSComb"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                          "Name"                   : "MistagOSComb",
-                                                          "InputName"              : "obsEtaOS"}
-
-    configdict["BasicVariables"]["MistagOSCharm"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                           "Name"                   : "MistagOSCharm",
-                                                           "InputName"              : "obsEtaOSCharm"}
-    
-    configdict["BasicVariables"]["MistagSSPionBDTRaw"]      = { "Range"                  : [ -1.0,    1.0     ],
-                                                                "Name"                   : "MistagSSPionBDTRaw",
-                                                                "InputName"              : "lab0_SS_nnetKaon_PROB"}
-
-    configdict["BasicVariables"]["MistagSSProtonRaw"]      = { "Range"                  : [ -1.0,    1.0     ],
-                                                               "Name"                   : "MistagSSProtonRaw",
-                                                               "InputName"              : "lab0_OS_nnetKaon_PROB"}
-
-    configdict["BasicVariables"]["BDTG"]           = { "Range"                  : [0.0, 1],
-                                                       "Name"                   : "BDTG",
-                                                       "InputName"              : "BDT_classifier"}
-
-    #Additional variables not foreseen before
-    configdict["AdditionalVariables"] = {}
-
-    
-    configdict["AdditionalVariables"]["BeautyPhi"]      = { "Range"                  : [ -10.,    10.     ],
-                                                            "Name"                   : "BeautyPhi",
-                                                            "InputName"              : "lab0_LOKI_PHI"}
-    
-    configdict["AdditionalVariables"]["BeautyEta"]      = { "Range"                  : [ 1.5,    10.0     ],
-                                                            "Name"                   : "BeautyEta",
-                                                            "InputName"              : "lab0_LOKI_ETA"}
-    
-    configdict["AdditionalVariables"]["BeautyPT"]      = { "Range"                  : [ 0.0,    100000     ],
-                                                           "Name"                   : "BeautyPT",
-                                                           "InputName"              : "lab0_PT"}
-
-    configdict["AdditionalVariables"]["BeautyP"]      = { "Range"                  : [ 0.0,    3000000     ],
-                                                          "Name"                   : "BeautyP",
-                                                          "InputName"              : "lab0_P"}
-
-    configdict["AdditionalVariables"]["CharmTime"]    = { "Range"                  : [-10,     10    ],
-                                                          "Name"                   : "CharmTime",
-                                                          "InputName"              : "lab2_TAU"}
-    
-    configdict["AdditionalVariables"]["nPV"]      = { "Range"                  : [ 0.0,    10     ],
-                                                      "Name"                   : "nPV",
-                                                      "InputName"              : "nPV"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo2BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo2BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo2BodyBBDTDecision_TOS"}
-    
-    configdict["AdditionalVariables"]["Hlt2Topo3BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo3BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo3BodyBBDTDecision_TOS"}
-    
-    configdict["AdditionalVariables"]["Hlt2Topo4BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo4BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo4BodyBBDTDecision_TOS"}
-
-    # PIDK bin
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"] = {"Data": "lab1_PIDK<5.0 && (obsTagOS!=0 || obsTagOSCharm!=0 || lab0_OS_nnetKaon_DEC !=0 || lab0_SS_nnetKaon_DEC!=0) && BDT_classifier>0.0 && obsTime>0.4 && obsTime<12.0 && lab0_FitDaughtersConst_M_flat>5090.0 && lab0_FitDaughtersConst_M_flat<6000.0 && nTracks>15 && nTracks<1000 && lab0_FitwithoutConst_Dplus_M_flat>1830 && lab0_FitwithoutConst_Dplus_M_flat<1904 && lab0_FitDaughtersConst_P0_P_flat>2000 && lab0_FitDaughtersConst_P0_P_flat<650000 && lab0_FitDaughtersConst_P0_PT_flat>400 && lab0_FitDaughtersConst_P0_PT_flat<45000 && lab0_LOKI_PHI>-10 && lab0_LOKI_PHI<10 && lab0_LOKI_ETA>1.5 && lab0_LOKI_ETA<10 && lab0_P>0 && lab0_P<3000000 && lab0_PT>0 && lab0_PT<100000"}
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_PiHypo_MC.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_PiHypo_MC.py
deleted file mode 100644
index db642365c950bca1b93bc31121db97fa545c0b67..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_PiHypo_MC.py
+++ /dev/null
@@ -1,103 +0,0 @@
-from ROOT import *
-
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bd2DPi"
-    # PIDK for bachelor
-    configdict["BachelorHypo"] = "Bd2DPi"
-    configdict["CharmModes"] = {"KPiPi"} 
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2012"} 
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "/afs/cern.ch/user/v/vibattis/cmtuser/UraniaDev_v6r2p1/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/config_Bd2DPi.txt"
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5090,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersConst_M_flat"}
-
-    configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1904    ],
-                                                      "Name"                   : "CharmMass",
-                                                      "InputName"              : "lab0_FitwithoutConst_Dplus_M_flat"}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.4,     12.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "obsTime"}
-    
-    configdict["BasicVariables"]["BacP"]          = { "Range"                  : [2000.0,  650000.0],
-                                                      "Name"                   : "BacP",
-                                                      "InputName"              : "lab0_FitDaughtersConst_P0_P_flat"}
-
-    configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-                                                      "Name"                   : "BacPT",
-                                                      "InputName"              : "lab0_FitDaughtersConst_P0_PT_flat"}
-
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0,    999.0     ],
-                                                      "Name"                   : "BacPIDK",
-                                                      "InputName"              : "lab1_PIDKcorr"}
-
-    configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-                                                      "Name"                   : "nTracks",
-                                                      "InputName"              : "nTracks"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_TRUEID"}
-    
-    configdict["BasicVariables"]["BDTG"]           = { "Range"                  : [0.0, 1],
-                                                       "Name"                   : "BDTG",
-                                                       "InputName"              : "BDT_classifier"}
-
-    #Additional variables not foreseen before
-    configdict["AdditionalVariables"] = {}
-    
-    configdict["AdditionalVariables"]["BeautyPhi"]      = { "Range"                  : [ -10.,    10.     ],
-                                                            "Name"                   : "BeautyPhi",
-                                                            "InputName"              : "lab0_LOKI_PHI"}
-    
-    configdict["AdditionalVariables"]["BeautyEta"]      = { "Range"                  : [ 1.5,    10.0     ],
-                                                            "Name"                   : "BeautyEta",
-                                                            "InputName"              : "lab0_LOKI_ETA"}
-    
-    configdict["AdditionalVariables"]["BeautyPT"]      = { "Range"                  : [ 0.0,    100000     ],
-                                                           "Name"                   : "BeautyPT",
-                                                           "InputName"              : "lab0_PT"}
-
-    configdict["AdditionalVariables"]["BeautyP"]      = { "Range"                  : [ 0.0,    3000000     ],
-                                                          "Name"                   : "BeautyP",
-                                                          "InputName"              : "lab0_P"}
-
-    configdict["AdditionalVariables"]["CharmTime"]    = { "Range"                  : [-10,     10    ],
-                                                          "Name"                   : "CharmTime",
-                                                          "InputName"              : "lab2_TAU"}
-    
-    configdict["AdditionalVariables"]["nPV"]      = { "Range"                  : [ 0.0,    10     ],
-                                                      "Name"                   : "nPV",
-                                                      "InputName"              : "nPV"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo2BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo2BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo2BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo3BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo3BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo3BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo4BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo4BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo4BodyBBDTDecision_TOS"}
-
-    # PIDK bin
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"] = {"MC": "lab0_BKGCAT<60 && (obsTagOS!=0 || obsTagOSCharm!=0 || obsTagSSPionBDT!=0 || obsTagSSProton!=0) && BDT_classifier>0.0 && obsTime>0.4 && obsTime<12.0 && lab1_PIDKcorr<5.0 && lab0_FitDaughtersConst_M_flat>5090.0 && lab0_FitDaughtersConst_M_flat<6000.0 && nTracks>15 && nTracks<1000 && lab0_FitwithoutConst_Dplus_M_flat>1830 && lab0_FitwithoutConst_Dplus_M_flat<1904 && lab0_FitDaughtersConst_P0_P_flat>2000 && lab0_FitDaughtersConst_P0_P_flat<650000 && lab0_FitDaughtersConst_P0_PT_flat>400 && lab0_FitDaughtersConst_P0_PT_flat<45000 && lab0_LOKI_PHI>-10 && lab0_LOKI_PHI<10 && lab0_LOKI_ETA>1.5 && lab0_LOKI_ETA<10 && lab0_P>0 && lab0_P<3000000 && lab0_PT>0 && lab0_PT<100000"}
-
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_PiHypo_MC_large.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_PiHypo_MC_large.py
deleted file mode 100644
index 2da9b9a2cb91fd13dc767e72a76cc2ff35bc77ef..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_PiHypo_MC_large.py
+++ /dev/null
@@ -1,125 +0,0 @@
-from ROOT import *
-
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bd2DPi"
-    # PIDK for bachelor
-    configdict["BachelorHypo"] = "Bd2DPi"
-    configdict["CharmModes"] = {"KPiPi"} 
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2011","2012"} 
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "/afs/cern.ch/user/v/vibattis/cmtuser/UraniaDev_v6r2p1/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/config_Bd2DPi_MC_large.txt"
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5220,    5600    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersConst_M_flat"}
-
-    configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1904    ],
-                                                      "Name"                   : "CharmMass",
-                                                      "InputName"              : "lab0_FitwithoutConst_Dplus_M_flat"}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.4,     12.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "obsTime"}
-
-    configdict["BasicVariables"]["BacP"]          = { "Range"                  : [2000.0,  650000.0],
-                                                      "Name"                   : "BacP",
-                                                      "InputName"              : "lab0_FitDaughtersConst_P0_P_flat"}
-
-    configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-                                                      "Name"                   : "BacPT",
-                                                      "InputName"              : "lab0_FitDaughtersConst_P0_PT_flat"}
-
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0,    999.0     ],
-                                                      "Name"                   : "BacPIDK",
-                                                      "InputName"              : "lab1_PIDKcorr"}
-
-    configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-                                                      "Name"                   : "nTracks",
-                                                      "InputName"              : "nTracks"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_TRUEID"}
-
-    configdict["BasicVariables"]["TagDecTrue"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                        "Name"                   : "TagDecTrue",
-                                                        "InputName"              : "TrueTag"}
-
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecOS",
-                                                      "InputName"              : "TagDecOS"}
-
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecSS",
-                                                      "InputName"              : "obsTagSS"}
-    
-    configdict["BasicVariables"]["MistagOS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagOS",
-                                                      "InputName"              : "MistagOS"}
-
-    configdict["BasicVariables"]["MistagSS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagSS",
-                                                      "InputName"              : "obsEtaSS"}
-    
-    configdict["BasicVariables"]["BDTG"]           = { "Range"                  : [0.0, 1],
-                                                       "Name"                   : "BDTG",
-                                                       "InputName"              : "BDT_classifier"}
-
-    #Additional variables not foreseen before
-    configdict["AdditionalVariables"] = {}
-
-    configdict["AdditionalVariables"]["BeautyPhi"]      = { "Range"                  : [ -10.,    10.     ],
-                                                            "Name"                   : "BeautyPhi",
-                                                            "InputName"              : "lab0_LOKI_PHI"}
-    
-    configdict["AdditionalVariables"]["BeautyEta"]      = { "Range"                  : [ 1.5,    10.0     ],
-                                                            "Name"                   : "BeautyEta",
-                                                            "InputName"              : "lab0_LOKI_ETA"}
-    
-    configdict["AdditionalVariables"]["BeautyPT"]      = { "Range"                  : [ 0.0,    100000     ],
-                                                           "Name"                   : "BeautyPT",
-                                                           "InputName"              : "lab0_PT"}
-
-    configdict["AdditionalVariables"]["BeautyP"]      = { "Range"                  : [ 0.0,    3000000     ],
-                                                          "Name"                   : "BeautyP",
-                                                          "InputName"              : "lab0_P"}
-
-    configdict["AdditionalVariables"]["CharmTime"]    = { "Range"                  : [-10,     10    ],
-                                                          "Name"                   : "CharmTime",
-                                                          "InputName"              : "lab2_TAU"}
-    
-    configdict["AdditionalVariables"]["nPV"]      = { "Range"                  : [ 0.0,    10     ],
-                                                      "Name"                   : "nPV",
-                                                      "InputName"              : "nPV"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo2BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo2BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo2BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo3BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo3BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo3BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo4BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo4BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo4BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["TriggerCategoryBroad"]      = { "Range"                  : [ 0.0,    10     ],
-                                                                       "Name"                   : "TriggerCategoryBroad",
-                                                                       "InputName"              : "TriggerCategoryBroad"}
-
-    # PIDK bin
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"] = {"MC": "lab0_BKGCAT==0 && (obsTagOS!=0 || obsTagOSCharm!=0 || obsTagSSPionBDT_Transformed!=0 || obsTagSSProton_Transformed!=0) && BDT_classifier>0.0 && obsTime>0.4 && obsTime<12.0 && lab1_PIDKcorr<5.0 && lab0_FitDaughtersConst_M_flat>5220.0 && lab0_FitDaughtersConst_M_flat<5600.0 && nTracks>15 && nTracks<1000 && lab0_FitwithoutConst_Dplus_M_flat>1830 && lab0_FitwithoutConst_Dplus_M_flat<1904 && lab0_FitDaughtersConst_P0_P_flat>2000 && lab0_FitDaughtersConst_P0_P_flat<650000 && lab0_FitDaughtersConst_P0_PT_flat>400 && lab0_FitDaughtersConst_P0_PT_flat<45000 && lab0_LOKI_PHI>-10 && lab0_LOKI_PHI<10 && lab0_LOKI_ETA>1.5 && lab0_LOKI_ETA<10 && lab0_P>0 && lab0_P<3000000 && lab0_PT>0 && lab0_PT<100000"}
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_PiHypo_MC_large_merged.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_PiHypo_MC_large_merged.py
deleted file mode 100644
index 91130894fc87b6ec1ebb45a15a99378a7eb5ebc3..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForWorkspace_PiHypo_MC_large_merged.py
+++ /dev/null
@@ -1,91 +0,0 @@
-from ROOT import *
-
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bd2DPi"
-    # PIDK for bachelor
-    configdict["BachelorHypo"] = "Bd2DPi"
-    configdict["CharmModes"] = {"KPiPi"} 
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"RunI"} 
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "/afs/cern.ch/user/v/vibattis/cmtuser/UraniaDev_v6r1/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/config_Bd2DPi_MC_large_merged.txt"
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5090,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersConst_M_flat"}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.2,     15.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_ctau_flat"}
-
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0,    999.0     ],
-                                                      "Name"                   : "BacPIDK",
-                                                      "InputName"              : "lab1_PIDKcorr"}
-
-    configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-                                                      "Name"                   : "nTracks",
-                                                      "InputName"              : "nTracks"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_TRUEID"}
-
-    configdict["BasicVariables"]["TagDecTrue"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                        "Name"                   : "TagDecTrue",
-                                                        "InputName"              : "TrueTag"}
-
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecOS",
-                                                      "InputName"              : "TagDecOS"}
-
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecSS",
-                                                      "InputName"              : "TagDecSS"}
-
-    configdict["BasicVariables"]["MistagOS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagOS",
-                                                      "InputName"              : "MistagOS"}
-
-    configdict["BasicVariables"]["MistagSS"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                      "Name"                   : "MistagSS",
-                                                      "InputName"              : "MistagSS"}
-    
-    configdict["BasicVariables"]["BDTG"]           = { "Range"                  : [0.0, 1],
-                                                       "Name"                   : "BDTG",
-                                                       "InputName"              : "BDT_classifier"}
-
-    #Additional variables not foreseen before
-    configdict["AdditionalVariables"] = {}
-    
-    configdict["AdditionalVariables"]["BeautyEta"]      = { "Range"                  : [ 1.5,    10.0     ],
-                                                            "Name"                   : "BeautyEta",
-                                                            "InputName"              : "lab0_LOKI_ETA"}
-    
-    configdict["AdditionalVariables"]["BeautyPT"]      = { "Range"                  : [ 0.0,    100000     ],
-                                                           "Name"                   : "BeautyPT",
-                                                           "InputName"              : "lab0_PT"}
-
-    configdict["AdditionalVariables"]["BeautyP"]      = { "Range"                  : [ 0.0,    3000000     ],
-                                                          "Name"                   : "BeautyP",
-                                                          "InputName"              : "lab0_P"}
-    
-    configdict["AdditionalVariables"]["nPV"]      = { "Range"                  : [ 0.0,    10     ],
-                                                      "Name"                   : "nPV",
-                                                      "InputName"              : "nPV"}
-
-    # PIDK bin
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"] = {"MC": "lab1_PIDKcorr<5.0&&lab0_BKGCAT==0"}
-
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForZeroACPAsymmetryTest.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForZeroACPAsymmetryTest.py
deleted file mode 100644
index 0fe4f87117389272f618e58c1637076707836bd9..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForZeroACPAsymmetryTest.py
+++ /dev/null
@@ -1,56 +0,0 @@
-def getconfig():
-
-    configdict = {}
-
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.4,     15.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_ctau_flat"}
-    configdict["BasicVariables"]["TagDecTrue"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                        "Name"                   : "TagDecTrue",
-                                                        "InputName"              : "TrueTag"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_TRUEID"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecOS",
-                                                      "InputName"              : "TagDecOS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecSS",
-                                                      "InputName"              : "TagDecSS"}
-
-    configdict["Samples"] = {}
-    configdict["Functions"] = {}
-                              
-
-    #Bootstrapped MC
-    configdict["Samples"]["BootstrappedMC"] = { "File" : "/eos/lhcb/wg/b2oc/TD_DPi_3fb/MCBootstrap/Bd2DPiMCFilteredS21RunIBothTaggedOnlyShortTimeNoProdDetCPAsymmAfter/Generator/BootstrapMC_Bd2DPiMCFilteredS21RunIBothTaggedOnlyShortTimeNoProdDetCPAsymmAfter_0.root",
-                                                "Workspace" : "workspace",
-                                                "Dataset" : "combData",
-                                                "Observable" : "BeautyTime",
-                                                "Category1" : "(TagDecOS_idx!=0||TagDecSS_idx!=0) && TagDecTrue_idx==-1",
-                                                "Category2" : "(TagDecOS_idx!=0||TagDecSS_idx!=0) && TagDecTrue_idx==1",
-                                                "Color" : 6,
-                                                "Width" : 2,
-                                                "Legend" : "Resampled Monte Carlo"}
-
-    #Analytical shape using parameters from fit to total MC
-    configdict["Functions"]["Fit"] = { "Expression" : "0",
-                                       "Color" : 4,
-                                       "Width" : 2,
-                                       "Legend" : "Expected"}
-    
-    configdict["Plot"] = { "Bins" : [0.4,0.8,1.2,1.6,2.0,2.4,2.8,3.2,3.6,4.0,
-                                     4.5,5.0,5.5,6.0,7.0,8.0,9.0,10.0,12.0],
-                           "Range" : [0.4,12.0],
-                           "TitleX" : "#tau [ps]",
-                           "TitleY" : "A_{#font[12]{CP}}",
-                           "Legend" : [0.2,0.7,0.4,0.9]
-                           }
-
-    configdict["Label"] = {"X" : 0.55,
-                           "Y" : 0.875,
-                           "Text" : "LHCb Preliminary"}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForZeroFinalStateAsymmetryTest.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForZeroFinalStateAsymmetryTest.py
deleted file mode 100644
index 5f831102b297dc35c404cb6ef216bbd99631d7a9..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/Bd2DPiConfigForZeroFinalStateAsymmetryTest.py
+++ /dev/null
@@ -1,56 +0,0 @@
-def getconfig():
-
-    configdict = {}
-
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.4,     15.0    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "lab0_FitDaughtersPVConst_ctau_flat"}
-    configdict["BasicVariables"]["TagDecTrue"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                        "Name"                   : "TagDecTrue",
-                                                        "InputName"              : "TrueTag"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_TRUEID"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecOS",
-                                                      "InputName"              : "TagDecOS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                      "Name"                   : "TagDecSS",
-                                                      "InputName"              : "TagDecSS"}
-
-    configdict["Samples"] = {}
-    configdict["Functions"] = {}
-                              
-
-    #Bootstrapped MC
-    configdict["Samples"]["BootstrappedMC"] = { "File" : "/eos/lhcb/wg/b2oc/TD_DPi_3fb/MCBootstrap/Bd2DPiMCFilteredS21RunIBothTaggedOnlyShortTimeNoProdDetCPAsymmAfter/Generator/BootstrapMC_Bd2DPiMCFilteredS21RunIBothTaggedOnlyShortTimeNoProdDetCPAsymmAfter_0.root",
-                                                "Workspace" : "workspace",
-                                                "Dataset" : "combData",
-                                                "Observable" : "BeautyTime",
-                                                "Category1" : "(TagDecOS_idx!=0||TagDecSS_idx!=0) && BacCharge_idx==1",
-                                                "Category2" : "(TagDecOS_idx!=0||TagDecSS_idx!=0) && BacCharge_idx==-1",
-                                                "Color" : 6,
-                                                "Width" : 2,
-                                                "Legend" : "Resampled Monte Carlo"}
-
-    #Analytical shape using parameters from fit to total MC
-    configdict["Functions"]["Fit"] = { "Expression" : "0",
-                                       "Color" : 4,
-                                       "Width" : 2,
-                                       "Legend" : "Expected"}
-    
-    configdict["Plot"] = { "Bins" : [0.4,0.8,1.2,1.6,2.0,2.4,2.8,3.2,3.6,4.0,
-                                     4.5,5.0,5.5,6.0,7.0,8.0,9.0,10.0,12.0],
-                           "Range" : [0.4,12.0],
-                           "TitleX" : "#tau [ps]",
-                           "TitleY" : "Raw charge asymmetry",
-                           "Legend" : [0.2,0.7,0.4,0.9]
-                           }
-
-    configdict["Label"] = {"X" : 0.55,
-                           "Y" : 0.875,
-                           "Text" : "LHCb Preliminary"}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/FTCalibComparison.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/FTCalibComparison.py
deleted file mode 100644
index f29e6cb2843b388d0f32017de78ad25e3f39b142..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/FTCalibComparison.py
+++ /dev/null
@@ -1,54 +0,0 @@
-def getconfig():
-
-    configdict = {}
-
-    configdict["Inputs"] = {}
-    configdict["Inputs"] = {
-        "BuCalibRLOGITbroadTrigWeightNo4body":
-        {"XML": "/eos/lhcb/wg/b2oc/TD_DPi_3fb/calibrations/RLogisticCalibration_Bd2JpsiKst_SS_20171101.xml"},
-        "BdDataFitFloatFT":
-        {"FileName" : "/afs/cern.ch/work/v/vibattis/public/B2DX/Bd2DPi/sFit/SSbarAccAsymmFTFloatingDMGammaConstrAllSamplesBlinded_SSrlogit/workResults.root",
-         "FitResult" : "fitresult_time_signal_TimePdf_dataSet_time_weighted",
-         "Workspace" : "workspace",
-         "Parameters" : ["p_0_RLogisticCalibration_Bd2JpsiKst_SS_20171101",
-                         "p_1_RLogisticCalibration_Bd2JpsiKst_SS_20171101",
-                         "dp_0_RLogisticCalibration_Bd2JpsiKst_SS_20171101",
-                         "dp_1_RLogisticCalibration_Bd2JpsiKst_SS_20171101"],
-         "Positions" : [22,24,15,17]
-         }
-        }
-    #configdict["Inputs"] = {
-    #    "BuCalibRLOGITbroadTrigWeightNo4body":
-    #    {"XML": "/eos/lhcb/wg/b2oc/TD_DPi_3fb/calibrations/RLogisticCalibration_Bu2D0Pi_OS_20171109.xml"},
-    #    "BdDataFitFloatFT":
-    #    {"FileName" : "/afs/cern.ch/work/v/vibattis/public/B2DX/Bd2DPi/sFit/SSbarAccAsymmFTFloatingDMGammaConstrAllSamplesBlinded_SSrlogit/workResults.root",
-    #     "FitResult" : "fitresult_time_signal_TimePdf_dataSet_time_weighted",
-    #     "Workspace" : "workspace",
-    #     "Parameters" : ["p_0_RLogisticCalibration_Bu2D0Pi_OS_20171109",
-    #                     "p_1_RLogisticCalibration_Bu2D0Pi_OS_20171109",
-    #                     "p_2_RLogisticCalibration_Bu2D0Pi_OS_20171109",
-    #                     "p_3_RLogisticCalibration_Bu2D0Pi_OS_20171109",
-    #                     "p_4_RLogisticCalibration_Bu2D0Pi_OS_20171109",
-    #                     "dp_0_RLogisticCalibration_Bu2D0Pi_OS_20171109",
-    #                     "dp_1_RLogisticCalibration_Bu2D0Pi_OS_20171109",
-    #                     "dp_2_RLogisticCalibration_Bu2D0Pi_OS_20171109",
-    #                     "dp_3_RLogisticCalibration_Bu2D0Pi_OS_20171109",
-    #                     "dp_4_RLogisticCalibration_Bu2D0Pi_OS_20171109"],
-    #     "Positions" : [23,25,26,27,28,16,18,19,20,21]
-    #     }
-        #"BuCalibRLOGITbroadTrigWeightNo4body":
-        #{"XML": "/afs/cern.ch/user/v/vibattis/gitdev/Bd2Dpi_selection/flavourtagging/EspressoCalibration/OSCalibMC/Bu2D0Pi_rlogitLink_NoProdAsymm_broadTrigBDTAUWeight/OS_Combination_Calibration.xml"},
-        #"BdCalibNo4bodyBubasisRLOGITbroadTrigWeight":
-        #{"XML": "/afs/cern.ch/user/v/vibattis/gitdev/Bd2Dpi_selection/flavourtagging/EspressoCalibration/OSCalibMC/Bd2DPi_rlogitLink_NoProdAsymm_useBubasis_broadTrigBDTAUWeight/OS_Combination_Calibration.xml"},
-    #    }
-
-    configdict["Parameters"] = {}
-    configdict["Parameters"] = [r"p_0", r"p_1", r"p_2", r"p_3", r"p_4", r"\Delta p_0", r"\Delta p_1", r"\Delta p_2", r"\Delta p_3", r"\Delta p_4"]
-    
-    #Temporary workaround
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5090,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersConst_M_flat"}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/OS_Combination_Bu2D0Pi_MC_logitLink.xml b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/OS_Combination_Bu2D0Pi_MC_logitLink.xml
deleted file mode 100644
index aee7c7d43ee66d0a8b192591b1b01dc4f8d3ff66..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/OS_Combination_Bu2D0Pi_MC_logitLink.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<!DOCTYPE boost_serialization>
-<boost_serialization signature="serialization::archive" version="13">
-<OS_Combination_Calibration class_id="4" tracking_level="1" version="0" object_id="_0">
-	<TypicalCalibration class_id="6" tracking_level="0" version="0">
-		<Calibration class_id="7" tracking_level="0" version="0"></Calibration>
-		<numParams>5</numParams>
-		<coeffs class_id="8" tracking_level="0" version="0">
-			<n>5</n>
-			<vector_size>5</vector_size>
-			<vector_data>
-				<item>4.21634419147436535e-03</item>
-				<item>-1.72702205002757098e-01</item>
-				<item>-1.44628403763530478e-01</item>
-				<item>-9.79547510803929544e-01</item>
-				<item>-2.30300979130005579e-01</item>
-			</vector_data>
-			<softwrap>0</softwrap>
-		</coeffs>
-		<delta_coeffs>
-			<n>5</n>
-			<vector_size>5</vector_size>
-			<vector_data>
-				<item>-2.65985818307990333e-02</item>
-				<item>3.30581186479285329e-03</item>
-				<item>-1.19582475991082647e-02</item>
-				<item>-1.08562936566428592e+00</item>
-				<item>7.48768575132982850e+00</item>
-			</vector_data>
-			<softwrap>0</softwrap>
-		</delta_coeffs>
-		<covariance class_id="9" tracking_level="0" version="0">
-			<n>5</n>
-			<m>5</m>
-			<matrix_numrows>5</matrix_numrows>
-			<matrix_numcols>5</matrix_numcols>
-			<matrix_numrows_store>5</matrix_numrows_store>
-			<matrix_data>
-				<item>2.73141450218684964e-06</item>
-				<item>-3.00535344669005112e-07</item>
-				<item>-3.94016615328105180e-07</item>
-				<item>7.04274623459920395e-07</item>
-				<item>3.53456673161870179e-06</item>
-				<item>-3.00535344669005165e-07</item>
-				<item>1.39136171053738242e-05</item>
-				<item>-4.48795458466770046e-06</item>
-				<item>-2.16766845152888291e-05</item>
-				<item>-3.99387727597157305e-05</item>
-				<item>-3.94016615328104969e-07</item>
-				<item>-4.48795458466769708e-06</item>
-				<item>9.76875191667935010e-05</item>
-				<item>-2.86779669737542687e-04</item>
-				<item>-7.08924566634636880e-04</item>
-				<item>7.04274623459919654e-07</item>
-				<item>-2.16766845152888359e-05</item>
-				<item>-2.86779669737542633e-04</item>
-				<item>5.84757322809524721e-02</item>
-				<item>-1.67425544984083005e-02</item>
-				<item>3.53456673161870688e-06</item>
-				<item>-3.99387727597156830e-05</item>
-				<item>-7.08924566634637314e-04</item>
-				<item>-1.67425544984083075e-02</item>
-				<item>9.31537392239397577e-01</item>
-			</matrix_data>
-			<_isSubmatrix>0</_isSubmatrix>
-			<softwrap>0</softwrap>
-		</covariance>
-		<delta_covariance>
-			<n>5</n>
-			<m>5</m>
-			<matrix_numrows>5</matrix_numrows>
-			<matrix_numcols>5</matrix_numcols>
-			<matrix_numrows_store>5</matrix_numrows_store>
-			<matrix_data>
-				<item>1.09256580087473969e-05</item>
-				<item>-1.20214137867602024e-06</item>
-				<item>-1.57606646131241839e-06</item>
-				<item>2.81709849383967692e-06</item>
-				<item>1.41382669264748156e-05</item>
-				<item>-1.20214137867601939e-06</item>
-				<item>5.56544684214953103e-05</item>
-				<item>-1.79518183386707815e-05</item>
-				<item>-8.67067380611553570e-05</item>
-				<item>-1.59755091038862786e-04</item>
-				<item>-1.57606646131241797e-06</item>
-				<item>-1.79518183386707849e-05</item>
-				<item>3.90750076667173841e-04</item>
-				<item>-1.14711867895017140e-03</item>
-				<item>-2.83569826653855186e-03</item>
-				<item>2.81709849383967904e-06</item>
-				<item>-8.67067380611553570e-05</item>
-				<item>-1.14711867895017140e-03</item>
-				<item>2.33902929123809972e-01</item>
-				<item>-6.69702179936332714e-02</item>
-				<item>1.41382669264748089e-05</item>
-				<item>-1.59755091038862976e-04</item>
-				<item>-2.83569826653855099e-03</item>
-				<item>-6.69702179936332576e-02</item>
-				<item>3.72614956895759342e+00</item>
-			</matrix_data>
-			<_isSubmatrix>0</_isSubmatrix>
-			<softwrap>0</softwrap>
-		</delta_covariance>
-		<cross_covariance>
-			<n>5</n>
-			<m>5</m>
-			<matrix_numrows>5</matrix_numrows>
-			<matrix_numcols>5</matrix_numcols>
-			<matrix_numrows_store>5</matrix_numrows_store>
-			<matrix_data>
-				<item>-2.69079359295235976e-08</item>
-				<item>-1.82101869416849669e-08</item>
-				<item>1.38893815980598482e-08</item>
-				<item>-4.04377429053841083e-07</item>
-				<item>4.62900405149124527e-07</item>
-				<item>-1.82101869416849603e-08</item>
-				<item>-1.84110662627989160e-07</item>
-				<item>-1.00754234100138437e-07</item>
-				<item>3.31132730810910284e-06</item>
-				<item>3.19694663491138396e-06</item>
-				<item>1.38893815980598433e-08</item>
-				<item>-1.00754234100138477e-07</item>
-				<item>-8.23287442229768163e-07</item>
-				<item>6.16303233129779876e-06</item>
-				<item>5.89121299634354613e-05</item>
-				<item>-4.04377429053840818e-07</item>
-				<item>3.31132730810910496e-06</item>
-				<item>6.16303233129779961e-06</item>
-				<item>-2.16712999057896858e-04</item>
-				<item>-6.85055478957600312e-04</item>
-				<item>4.62900405149125056e-07</item>
-				<item>3.19694663491138269e-06</item>
-				<item>5.89121299634354139e-05</item>
-				<item>-6.85055478957599770e-04</item>
-				<item>-2.83725744478608224e-03</item>
-			</matrix_data>
-			<_isSubmatrix>0</_isSubmatrix>
-			<softwrap>0</softwrap>
-		</cross_covariance>
-	</TypicalCalibration>
-	<func class_id="3" tracking_level="1" version="0" object_id="_1">
-		<CalibrationFunction class_id="10" tracking_level="0" version="0"></CalibrationFunction>
-		<glm class_id="11" tracking_level="0" version="0">
-			<tx class_id="1" tracking_level="1" version="0" object_id="_2">
-				<nodes>
-					<count>5</count>
-					<item_version>0</item_version>
-					<item>2.38418579101562500e-07</item>
-					<item>2.55149788944495359e-01</item>
-					<item>5.05155649267968077e-01</item>
-					<item>8.85336722477408911e-01</item>
-					<item>3.36787282293199119e+00</item>
-				</nodes>
-				<GLMModel class_id="13" tracking_level="0" version="0"></GLMModel>
-				<nodes>
-					<count>5</count>
-					<item_version>0</item_version>
-					<item>2.38418579101562500e-07</item>
-					<item>2.55149788944495359e-01</item>
-					<item>5.05155649267968077e-01</item>
-					<item>8.85336722477408911e-01</item>
-					<item>3.36787282293199119e+00</item>
-				</nodes>
-				<size>5</size>
-				<basis>
-					<n>5</n>
-					<m>5</m>
-					<matrix_numrows>5</matrix_numrows>
-					<matrix_numcols>5</matrix_numcols>
-					<matrix_numrows_store>5</matrix_numrows_store>
-					<matrix_data>
-						<item>1.00000000000000000e+00</item>
-						<item>0.00000000000000000e+00</item>
-						<item>0.00000000000000000e+00</item>
-						<item>0.00000000000000000e+00</item>
-						<item>0.00000000000000000e+00</item>
-						<item>-5.41625644765184378e-01</item>
-						<item>1.00000000000000000e+00</item>
-						<item>0.00000000000000000e+00</item>
-						<item>0.00000000000000000e+00</item>
-						<item>0.00000000000000000e+00</item>
-						<item>2.00304729410524518e-01</item>
-						<item>-6.39298818370660826e-01</item>
-						<item>1.00000000000000000e+00</item>
-						<item>0.00000000000000000e+00</item>
-						<item>0.00000000000000000e+00</item>
-						<item>-1.50124828398861248e-02</item>
-						<item>8.62620499261356199e-02</item>
-						<item>-7.11025883909527034e-01</item>
-						<item>1.00000000000000000e+00</item>
-						<item>0.00000000000000000e+00</item>
-						<item>3.74022979365304679e-03</item>
-						<item>-3.49109096081036060e-02</item>
-						<item>5.83968637435340443e-01</item>
-						<item>-1.39481525078876367e+00</item>
-						<item>1.00000000000000000e+00</item>
-					</matrix_data>
-					<_isSubmatrix>0</_isSubmatrix>
-					<softwrap>0</softwrap>
-				</basis>
-			</tx>
-		</glm>
-		<length>5</length>
-		<L>1</L>
-	</func>
-</OS_Combination_Calibration>
-</boost_serialization>
-
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/OS_Combination_Bu2D0Pi_MC_rlogitLink.xml b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/OS_Combination_Bu2D0Pi_MC_rlogitLink.xml
deleted file mode 100644
index 1372f3f1d04e28fe4c6ce7e3af77c4ee7150023d..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/OS_Combination_Bu2D0Pi_MC_rlogitLink.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<!DOCTYPE boost_serialization>
-<boost_serialization signature="serialization::archive" version="13">
-<OS_Combination_Calibration class_id="4" tracking_level="1" version="0" object_id="_0">
-	<TypicalCalibration class_id="6" tracking_level="0" version="0">
-		<Calibration class_id="7" tracking_level="0" version="0"></Calibration>
-		<numParams>5</numParams>
-		<coeffs class_id="8" tracking_level="0" version="0">
-			<n>5</n>
-			<vector_size>5</vector_size>
-			<vector_data>
-				<item>-7.26732947054929690e-02</item>
-				<item>-1.87567381000006306e-01</item>
-				<item>-7.72433545410651165e-03</item>
-				<item>-2.53441276043778307e-01</item>
-				<item>-4.69960685607039297e-01</item>
-			</vector_data>
-			<softwrap>0</softwrap>
-		</coeffs>
-		<delta_coeffs>
-			<n>5</n>
-			<vector_size>5</vector_size>
-			<vector_data>
-				<item>-4.99376781176538512e-02</item>
-				<item>2.85366072857846549e-02</item>
-				<item>-1.03301449506934141e-02</item>
-				<item>-1.49492351808998506e-02</item>
-				<item>5.00775161052311679e-01</item>
-			</vector_data>
-			<softwrap>0</softwrap>
-		</delta_coeffs>
-		<covariance class_id="9" tracking_level="0" version="0">
-			<n>5</n>
-			<m>5</m>
-			<matrix_numrows>5</matrix_numrows>
-			<matrix_numcols>5</matrix_numcols>
-			<matrix_numrows_store>5</matrix_numrows_store>
-			<matrix_data>
-				<item>1.43474802077623383e-05</item>
-				<item>4.31408426245808410e-07</item>
-				<item>-5.93164311793445534e-07</item>
-				<item>-4.54823639606748028e-07</item>
-				<item>8.10641894714199599e-06</item>
-				<item>4.31408426245808357e-07</item>
-				<item>1.86632283630320610e-05</item>
-				<item>7.29265209408152093e-07</item>
-				<item>-1.50748986587044378e-05</item>
-				<item>-4.83210237302847664e-05</item>
-				<item>-5.93164311793445004e-07</item>
-				<item>7.29265209408152199e-07</item>
-				<item>2.33428591272429361e-06</item>
-				<item>7.74064794728885478e-06</item>
-				<item>-2.11994160710777731e-05</item>
-				<item>-4.54823639606752263e-07</item>
-				<item>-1.50748986587044073e-05</item>
-				<item>7.74064794728885308e-06</item>
-				<item>3.64388981369534405e-04</item>
-				<item>1.26460362752263324e-03</item>
-				<item>8.10641894714198244e-06</item>
-				<item>-4.83210237302846579e-05</item>
-				<item>-2.11994160710778578e-05</item>
-				<item>1.26460362752263194e-03</item>
-				<item>9.43874862842585503e-03</item>
-			</matrix_data>
-			<_isSubmatrix>0</_isSubmatrix>
-			<softwrap>0</softwrap>
-		</covariance>
-		<delta_covariance>
-			<n>5</n>
-			<m>5</m>
-			<matrix_numrows>5</matrix_numrows>
-			<matrix_numcols>5</matrix_numcols>
-			<matrix_numrows_store>5</matrix_numrows_store>
-			<matrix_data>
-				<item>5.73899208310493802e-05</item>
-				<item>1.72563370498323258e-06</item>
-				<item>-2.37265724717378129e-06</item>
-				<item>-1.81929455842697877e-06</item>
-				<item>3.24256757885680856e-05</item>
-				<item>1.72563370498323046e-06</item>
-				<item>7.46529134521281898e-05</item>
-				<item>2.91706083763261388e-06</item>
-				<item>-6.02995946348176834e-05</item>
-				<item>-1.93284094921139147e-04</item>
-				<item>-2.37265724717378256e-06</item>
-				<item>2.91706083763260287e-06</item>
-				<item>9.33714365089717103e-06</item>
-				<item>3.09625917891553920e-05</item>
-				<item>-8.47976642843113905e-05</item>
-				<item>-1.81929455842693346e-06</item>
-				<item>-6.02995946348176359e-05</item>
-				<item>3.09625917891552023e-05</item>
-				<item>1.45755592547813632e-03</item>
-				<item>5.05841451009053557e-03</item>
-				<item>3.24256757885683363e-05</item>
-				<item>-1.93284094921138090e-04</item>
-				<item>-8.47976642843124476e-05</item>
-				<item>5.05841451009052170e-03</item>
-				<item>3.77549945137034479e-02</item>
-			</matrix_data>
-			<_isSubmatrix>0</_isSubmatrix>
-			<softwrap>0</softwrap>
-		</delta_covariance>
-		<cross_covariance>
-			<n>5</n>
-			<m>5</m>
-			<matrix_numrows>5</matrix_numrows>
-			<matrix_numcols>5</matrix_numcols>
-			<matrix_numrows_store>5</matrix_numrows_store>
-			<matrix_data>
-				<item>4.79108524007580309e-07</item>
-				<item>-6.63466935351292406e-07</item>
-				<item>1.11782043725627435e-07</item>
-				<item>4.44950440327298380e-07</item>
-				<item>-2.49295775663589026e-06</item>
-				<item>-6.63466935351295583e-07</item>
-				<item>1.27750056404534568e-06</item>
-				<item>-3.77665069789340924e-07</item>
-				<item>4.63476952562602962e-07</item>
-				<item>7.36274792822983862e-07</item>
-				<item>1.11782043725627356e-07</item>
-				<item>-3.77665069789340818e-07</item>
-				<item>1.90941561431056826e-07</item>
-				<item>-1.34534599556508209e-06</item>
-				<item>2.64774860250774076e-06</item>
-				<item>4.44950440327359790e-07</item>
-				<item>4.63476952562519000e-07</item>
-				<item>-1.34534599556504101e-06</item>
-				<item>1.44083234399174627e-05</item>
-				<item>2.48725866396361272e-04</item>
-				<item>-2.49295775663560099e-06</item>
-				<item>7.36274792822608415e-07</item>
-				<item>2.64774860250803680e-06</item>
-				<item>2.48725866396361163e-04</item>
-				<item>-3.84230505116891748e-03</item>
-			</matrix_data>
-			<_isSubmatrix>0</_isSubmatrix>
-			<softwrap>0</softwrap>
-		</cross_covariance>
-	</TypicalCalibration>
-	<func class_id="3" tracking_level="1" version="0" object_id="_1">
-		<CalibrationFunction class_id="10" tracking_level="0" version="0"></CalibrationFunction>
-		<glm class_id="11" tracking_level="0" version="0">
-			<tx class_id="1" tracking_level="1" version="0" object_id="_2">
-				<nodes>
-					<count>5</count>
-					<item_version>0</item_version>
-					<item>-1.59423850336694457e+01</item>
-					<item>-1.92876569586871405e+00</item>
-					<item>-1.11284796309195499e+00</item>
-					<item>-3.39817544410322858e-01</item>
-					<item>2.63965492329561835e+00</item>
-				</nodes>
-				<GLMModel class_id="13" tracking_level="0" version="0"></GLMModel>
-				<nodes>
-					<count>5</count>
-					<item_version>0</item_version>
-					<item>-1.59423850336694457e+01</item>
-					<item>-1.92876569586871405e+00</item>
-					<item>-1.11284796309195499e+00</item>
-					<item>-3.39817544410322858e-01</item>
-					<item>2.63965492329561835e+00</item>
-				</nodes>
-				<size>5</size>
-				<basis>
-					<n>5</n>
-					<m>5</m>
-					<matrix_numrows>5</matrix_numrows>
-					<matrix_numcols>5</matrix_numcols>
-					<matrix_numrows_store>5</matrix_numrows_store>
-					<matrix_data>
-						<item>1.00000000000000000e+00</item>
-						<item>0.00000000000000000e+00</item>
-						<item>0.00000000000000000e+00</item>
-						<item>0.00000000000000000e+00</item>
-						<item>0.00000000000000000e+00</item>
-						<item>3.56842959061971943e-01</item>
-						<item>1.00000000000000000e+00</item>
-						<item>0.00000000000000000e+00</item>
-						<item>0.00000000000000000e+00</item>
-						<item>0.00000000000000000e+00</item>
-						<item>-2.19114197860528236e+02</item>
-						<item>-3.87197750930472679e+01</item>
-						<item>1.00000000000000000e+00</item>
-						<item>0.00000000000000000e+00</item>
-						<item>0.00000000000000000e+00</item>
-						<item>6.46396615067687748e+01</item>
-						<item>1.01243173615860833e+01</item>
-						<item>-3.04080997452694957e-01</item>
-						<item>1.00000000000000000e+00</item>
-						<item>0.00000000000000000e+00</item>
-						<item>-1.74047493295904552e+01</item>
-						<item>-2.58767582955610065e+00</item>
-						<item>8.34070085809292261e-02</item>
-						<item>-7.38729105692466415e-01</item>
-						<item>1.00000000000000000e+00</item>
-					</matrix_data>
-					<_isSubmatrix>0</_isSubmatrix>
-					<softwrap>0</softwrap>
-				</basis>
-			</tx>
-		</glm>
-		<length>5</length>
-		<L>2</L>
-	</func>
-</OS_Combination_Calibration>
-</boost_serialization>
-
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/config_Bd2DPi.txt b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/config_Bd2DPi.txt
deleted file mode 100644
index cdce4f678a68c45a97c4bf949b656d89d10e85fa..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/config_Bd2DPi.txt
+++ /dev/null
@@ -1,227 +0,0 @@
-#Bd2DPi KPiPi 2011 Bd2DPiHypo
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/data/
-Data2011_Bd2Dpi_20171013_Bd2DpiHypo_magDown_S21_afterSelection.root
-Data2011_Bd2Dpi_20171013_Bd2DpiHypo_magUp_S21_afterSelection.root
-Bd2Dpi
-Bd2Dpi
-
-#Bd2DPi KPiPi 2011 Bd2DKHypo
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/data/
-Data2011_Bd2Dpi_20171013_Bd2DKHypo_magDown_S21_afterSelection.root
-Data2011_Bd2Dpi_20171013_Bd2DKHypo_magUp_S21_afterSelection.root
-Bd2Dpi
-Bd2Dpi
-
-#Bd2DPi KPiPi 2012 Bd2DPiHypo
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/data/
-Data2012_Bd2Dpi_20171013_Bd2DpiHypo_magDown_S21_afterSelection.root
-Data2012_Bd2Dpi_20171013_Bd2DpiHypo_magUp_S21_afterSelection.root
-Bd2Dpi
-Bd2Dpi
-
-#Bd2DPi KPiPi 2012 Bd2DKHypo
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/data/
-Data2012_Bd2Dpi_20171013_Bd2DKHypo_magDown_S21_afterSelection.root
-Data2012_Bd2Dpi_20171013_Bd2DKHypo_magUp_S21_afterSelection.root
-Bd2Dpi
-Bd2Dpi
-
-#Signal Bd2DPi KPiPi 2011 Bd2DPiHypo
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/
-MCfiltered_Bd2DPi_Bd2DPiHypo_magDown_2011_S21_afterSelection_SSMCtrained_SSandOSCombined_PID-corrected_new.root
-MCfiltered_Bd2DPi_Bd2DPiHypo_magUp_2011_S21_afterSelection_SSMCtrained_SSandOSCombined_PID-corrected_new.root
-Bd2Dpi
-Bd2Dpi
-###
-
-#Signal Bd2DPi KPiPi 2012 Bd2DPiHypo
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/
-MCfiltered_Bd2DPi_Bd2DPiHypo_magDown_2012_S21_afterSelection_SSMCtrained_SSandOSCombined_PID-corrected_new.root
-MCfiltered_Bd2DPi_Bd2DPiHypo_magUp_2012_S21_afterSelection_SSMCtrained_SSandOSCombined_PID-corrected_new.root
-Bd2Dpi
-Bd2Dpi
-###
-
-#Signal Bd2DPi KPiPi 2011 Bd2DKHypo
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/
-MCfiltered_Bd2DPi_Bd2DKHypo_magDown_2011_S21_afterSelection_PID-corrected_new.root
-MCfiltered_Bd2DPi_Bd2DKHypo_magUp_2011_S21_afterSelection_PID-corrected_new.root
-Bd2DK
-Bd2DK
-###
-
-#Signal Bd2DPi KPiPi 2012 Bd2DKHypo
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/
-MCfiltered_Bd2DPi_Bd2DKHypo_magDown_2012_S21_afterSelection_PID-corrected_new.root
-MCfiltered_Bd2DPi_Bd2DKHypo_magUp_2012_S21_afterSelection_PID-corrected_new.root
-Bd2DK
-Bd2DK
-###
-
-#MC FileName KPiPi MD 2011 Bd2DPiHypo
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DK_Bd2DPiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bs2DsPi_Bd2DPiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Lb2LcPi_Bd2DPiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-{"Mode":"Bd2DRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DRho_Bd2DPiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DstPi_Bd2DPiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-{"Mode":"Bd2DKst",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DKst_Bd2DPiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-###
-
-#MC FileName KPiPi MU 2011 Bd2DPiHypo
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DK_Bd2DPiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bs2DsPi_Bd2DPiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Lb2LcPi_Bd2DPiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-{"Mode":"Bd2DRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DRho_Bd2DPiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DstPi_Bd2DPiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-{"Mode":"Bd2DKst",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DKst_Bd2DPiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-###
-
-#MC FileName KPiPi MD 2011 Bd2DKHypo
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DK_Bd2DKHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bs2DsPi_Bd2DKHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Lb2LcPi_Bd2DKHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-{"Mode":"Bd2DRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DRho_Bd2DKHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DstPi_Bd2DKHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-{"Mode":"Bd2DKst",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DKst_Bd2DKHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-###
-
-#MC FileName KPiPi MU 2011 Bd2DKHypo
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DK_Bd2DKHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bs2DsPi_Bd2DKHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Lb2LcPi_Bd2DKHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-{"Mode":"Bd2DRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DRho_Bd2DKHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DstPi_Bd2DKHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-{"Mode":"Bd2DKst",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DKst_Bd2DKHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-###
-
-#MC FileName KPiPi MD 2012 Bd2DPiHypo
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DK_Bd2DPiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}	
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bs2DsPi_Bd2DPiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Lb2LcPi_Bd2DPiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-{"Mode":"Bd2DRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DRho_Bd2DPiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DstPi_Bd2DPiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-{"Mode":"Bd2DKst",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DKst_Bd2DPiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-###
-
-#MC FileName KPiPi MU 2012 Bd2DPiHypo
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DK_Bd2DPiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bs2DsPi_Bd2DPiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Lb2LcPi_Bd2DPiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-{"Mode":"Bd2DRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DRho_Bd2DPiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DstPi_Bd2DPiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-{"Mode":"Bd2DKst",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DKst_Bd2DPiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2Dpi"}
-###
-
-#MC FileName KPiPi MD 2012 Bd2DKHypo
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DK_Bd2DKHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bs2DsPi_Bd2DKHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Lb2LcPi_Bd2DKHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-{"Mode":"Bd2DRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DRho_Bd2DKHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DstPi_Bd2DKHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-{"Mode":"Bd2DKst",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DKst_Bd2DKHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-###
-
-#MC FileName KPiPi MU 2012 Bd2DKHypo
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DK_Bd2DKHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bs2DsPi_Bd2DKHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Lb2LcPi_Bd2DKHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-{"Mode":"Bd2DRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DRho_Bd2DKHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DstPi_Bd2DKHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-{"Mode":"Bd2DKst",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/MC_Bd2DKst_Bd2DKHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bd2DK"}
-###
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/config_Bd2DPi_MC_large.txt b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/config_Bd2DPi_MC_large.txt
deleted file mode 100644
index f90a08523bb58c50ffaeb9faca458955b5f8fdf8..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/config_Bd2DPi_MC_large.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-#Signal Bd2DPi KPiPi 2011 Bd2DPiHypo
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/
-MCfiltered_Bd2DPi_Bd2DPiHypo_magUp_2011_S21_afterSelection_SSMCtrained_SSandOSCombined_PID-corrected_new.root
-MCfiltered_Bd2DPi_Bd2DPiHypo_magDown_2011_S21_afterSelection_SSMCtrained_SSandOSCombined_PID-corrected_new.root
-Bd2Dpi
-Bd2Dpi
-###
-
-#Signal Bd2DPi KPiPi 2012 Bd2DPiHypo
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/
-MCfiltered_Bd2DPi_Bd2DPiHypo_magUp_2012_S21_afterSelection_SSMCtrained_SSandOSCombined_PID-corrected_new.root
-MCfiltered_Bd2DPi_Bd2DPiHypo_magDown_2012_S21_afterSelection_SSMCtrained_SSandOSCombined_PID-corrected_new.root
-Bd2Dpi
-Bd2Dpi
-###
-
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/config_Bd2DPi_MC_large_merged.txt b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/config_Bd2DPi_MC_large_merged.txt
deleted file mode 100644
index 50e49494593a6a986de24cdd9e3b7f9a3bc793f0..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/config_Bd2DPi_MC_large_merged.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-#Signal Bd2DPi KPiPi RunI Bd2DPiHypo
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/MC/
-MCfiltered_Bd2DPi_Bd2DPiHypo_both_RunI_S21_afterSelection_PID-corrected_new_OSandSSTagsCombined.root
-Bd2Dpi
-###
-
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/sFitDataComparison.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/sFitDataComparison.py
deleted file mode 100644
index b433e2934619422dc8da56d2aeeadd34fff5f6eb..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bd2DPi/sFitDataComparison.py
+++ /dev/null
@@ -1,25 +0,0 @@
-def getconfig():
-
-    configdict = {}
-
-    dir="/afs/cern.ch/work/v/vibattis/public/B2DX/Bd2DPi/sFit/"
-    configdict["Inputs"] = {}
-    configdict["Inputs"] = {
-        "OSExlusive": { "FileName"    : dir+"SSbarAccAsymmFloatingDMGammaConstrOSExclusiveBlinded_Nov2016/workResults.root",
-                        "Workspace"   : "workspace",
-                        "FitResult"   : "fitresult_time_signal_TimePdf_dataSet_time_weighted"},
-        "SSExlusive": { "FileName"    : dir+"SSbarAccAsymmFloatingDMGammaConstrSSExclusiveBlinded_Nov2016/workResults.root",
-                        "Workspace"   : "workspace",
-                        "FitResult"   : "fitresult_time_signal_TimePdf_dataSet_time_weighted"},
-        "SSOSOverlap": { "FileName"   : dir+"SSbarAccAsymmFloatingDMGammaConstrSSOSOverlapBlinded_Nov2016/workResults.root",
-                         "Workspace"  : "workspace",
-                         "FitResult"  : "fitresult_time_signal_TimePdf_dataSet_time_weighted"}
-        }
-    
-    #Temporary workaround
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5090,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersConst_M_flat"}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/Bu2D0PiConfigForChangeHypo.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/Bu2D0PiConfigForChangeHypo.py
deleted file mode 100644
index 1115f3f136e2ef31fddb054c4b72eaf845c6b584..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/Bu2D0PiConfigForChangeHypo.py
+++ /dev/null
@@ -1,42 +0,0 @@
-from ROOT import *
-
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # PrefixID's: all the following fields are mandatory (choose either ID or newID for each particle)
-    # The number of Bachelors, Charm particles and Charm children is flexible
-    configdict["Charm1ChildrenPrefix"] = { "Child1"   : {"Name": "lab3",
-                                                         "ID": "K",
-                                                         "Type": "D"},
-
-                                           "Child2"   : {"Name": "lab4",
-                                                         "ID": "Pi",
-                                                         "Type": "D"},
-                                           }
-    
-    configdict["BeautyChildrenPrefix"] = { "Bachelor1" : {"Name": "lab1",
-                                                          "newID": "K",
-                                                          "Type": "D"},
-                                           
-                                           "Charm1"    : {"Name": "lab2",
-                                                          "ID": "D0",
-                                                          "Type": "D"}
-                                           }
-    
-    configdict["BeautyPrefix"] = { "Name": "lab0",
-                                   "Type": "D"}
-
-    # Handle multiple candidates (if any). Comment out if not needed
-    #configdict["Index"] = "nPV"
-
-    #Additional "pedix" in the branch name. Leave "" if not pedix is required
-    configdict["Pedix"] = ""
-
-    #Mass name pedix (M, MM etc...)
-    configdict["MassPedix"] = "_MM"
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/Bu2D0PiConfigForMDFitter_Bu.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/Bu2D0PiConfigForMDFitter_Bu.py
deleted file mode 100644
index 0f21dd45d288d275fd4d5c0d6b24cc64af4d6155..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/Bu2D0PiConfigForMDFitter_Bu.py
+++ /dev/null
@@ -1,521 +0,0 @@
-from ROOT import *
-
-def getconfig( samplemodeyear ) :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    import ROOT
-    
-     # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5130,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_MM"}
-
-    #configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.0004,     0.012    ],
-    #                                                  "Bins"                   : 40,
-    #                                                  "Name"                   : "BeautyTime",
-    #                                                  "InputName"              : "lab0_TAU"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0,    999.0     ],
-                                                      "Name"                   : "BacPIDK",
-                                                      "InputName"              : "lab1_PIDK"}
-
-    configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-                                                      "Name"                   : "nTracks",
-                                                      "InputName"              : "nTracks"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_ID"}
-
-    configdict["BasicVariables"]["TagDecOSComb"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                          "Name"                   : "TagDecOSCharm",
-                                                          "InputName"              : "lab0_TAGDECISION_OS"}
-
-    configdict["BasicVariables"]["TagDecOSCharm"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                           "Name"                   : "TagDecOSCharm",
-                                                           "InputName"              : "lab0_OS_Charm_DEC"}
-
-    configdict["BasicVariables"]["MistagOSComb"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                          "Name"                   : "MistagOSComb",
-                                                          "InputName"              : "lab0_TAGOMEGA_OS"}
-
-    configdict["BasicVariables"]["MistagOSCharm"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                           "Name"                   : "MistagOSCharm",
-                                                           "InputName"              : "lab0_OS_Charm_PROB"}
-
-    #Additional variables not foreseen before
-    configdict["AdditionalVariables"] = {}
-
-    configdict["AdditionalVariables"]["BeautyID"]      = { "Range"                  : [ -1000.,    1000.     ],
-                                                           "Name"                   : "BeautyID",
-                                                           "InputName"              : "lab0_ID"}
-    
-    configdict["AdditionalVariables"]["BeautyPhi"]      = { "Range"                  : [ -10.,    10.     ],
-                                                            "Name"                   : "BeautyPhi",
-                                                            "InputName"              : "lab0_LOKI_PHI"}
-    
-    configdict["AdditionalVariables"]["BeautyEta"]      = { "Range"                  : [ 1.5,    10.0     ],
-                                                            "Name"                   : "BeautyEta",
-                                                            "InputName"              : "lab0_LOKI_ETA"}
-    
-    configdict["AdditionalVariables"]["BeautyPT"]      = { "Range"                  : [ 0.0,    100000     ],
-                                                           "Name"                   : "BeautyPT",
-                                                           "InputName"              : "lab0_PT"}
-
-    configdict["AdditionalVariables"]["BeautyP"]      = { "Range"                  : [ 0.0,    3000000     ],
-                                                          "Name"                   : "BeautyP",
-                                                          "InputName"              : "lab0_P"}
-
-    configdict["AdditionalVariables"]["CharmTime"]    = { "Range"                  : [-10,     10    ],
-                                                          "Name"                   : "CharmTime",
-                                                          "InputName"              : "lab2_TAU"}
-
-    configdict["AdditionalVariables"]["BeautyTimeScaled"]    = { "Range"                  : [0.0004,     0.012    ],
-                                                            "Bins"                   : 40,
-                                                            "Name"                   : "BeautyTimeScaled",
-                                                            "InputName"              : "lab0_TAU"}
-    
-    configdict["AdditionalVariables"]["nPV"]      = { "Range"                  : [ 0.0,    10     ],
-                                                      "Name"                   : "nPV",
-                                                      "InputName"              : "nPV"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo2BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo2BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo2BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo3BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo3BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo3BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo4BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0    ],
-                                                                                "Name"                   : "Hlt2Topo4BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo4BodyBBDTDecision_TOS"}
-
-    #Useful constants
-    Pipeak = 5.2806e+03
-    Kpeak = 5.2803e+03
-
-    #Global variables (shared by different PDFs)
-    configdict["GlobalVariables"] = {}
-    configdict["GlobalVariables"]["eff_Bu2D0Pi_D0Pi"] = {}
-    configdict["GlobalVariables"]["eff_Bu2D0Pi_D0Pi"] = {"Type": "RooRealVar",
-                                                         "Title": r"\epsilon_{\rm PID}(B^{+}\to D^{0}\pi)_{\pi}",
-                                                         "Range": [0.978],# 0.8, 1.0],
-                                                         "Error": 0.007
-                                                         }
-    configdict["GlobalVariables"]["eff_Bu2D0K_D0K"] = {}
-    configdict["GlobalVariables"]["eff_Bu2D0K_D0K"] = {"Type": "RooRealVar",
-                                                       "Title": r"\epsilon_{\rm PID}(B^{+}\to D^{0}K)_{K}",
-                                                       "Range": [0.653],# 0.4, 0.9],
-                                                       "Error": 0.01
-                                                       }
-    configdict["GlobalVariables"]["Signal_BeautyMass_mean_"+samplemodeyear+"_Bu2D0PiHypo"] = {}
-    configdict["GlobalVariables"]["Signal_BeautyMass_mean_"+samplemodeyear+"_Bu2D0PiHypo"] = {"Type": "RooRealVar",
-                                                                                              "Title": r"\mu^{\pi}_{B^{+}\to D^{0}\pi}",
-                                                                                              "Range": [Pipeak, 5.2e+03, 5.35e+03]
-                                                                                              }
-    configdict["GlobalVariables"]["Signal_BeautyMass_mean_"+samplemodeyear+"_Bu2D0KHypo"] = {}
-    configdict["GlobalVariables"]["Signal_BeautyMass_mean_"+samplemodeyear+"_Bu2D0KHypo"] = {"Type": "RooRealVar",
-                                                                                             "Title": r"\mu^{K}_{B^{+}\to D^{0}\pi}",
-                                                                                             "Range": [Kpeak, 5.2e+03, 5.35e+03]
-                                                                                             }
-    configdict["GlobalVariables"]["nSig_"+samplemodeyear+"_Bu2D0PiHypo_Evts"] = {"Type": "RooRealVar",
-                                                                                 "Title": r"N^{\pi}_{B^{+}\to D\pi}",
-                                                                                 "Range": [3e+05,0,1200000]
-                                                                                 }
-    configdict["GlobalVariables"]["nSig_"+samplemodeyear+"_Bu2D0KHypo_Evts"] = {"Type": "RooFormulaVar",
-                                                                                "Title": r"N^{K}_{B^{+}\to D^{0}\pi}",
-                                                                                "Formula": "((1-@0)/@0)*@1",
-                                                                                "Dependents": ["eff_Bu2D0Pi_D0Pi", "nSig_"+samplemodeyear+"_Bu2D0PiHypo_Evts"]
-                                                                                }
-    configdict["GlobalVariables"]["nBu2D0K_"+samplemodeyear+"_Bu2D0KHypo_Evts"] = {"Type": "RooRealVar",
-                                                                                   "Title": r"N^{K}_{B^{+}\to D^{0}K}",
-                                                                                   "Range": [2e+04,0,100000]
-                                                                                   }
-    configdict["GlobalVariables"]["nBu2D0K_"+samplemodeyear+"_Bu2D0PiHypo_Evts"] = {"Type": "RooFormulaVar",
-                                                                                    "Title": r"N^{\pi}_{B^{+}\to D^{0}K}",
-                                                                                    "Formula": "((1-@0)/@0)*@1",
-                                                                                    "Dependents": ["eff_Bu2D0K_D0K", "nBu2D0K_"+samplemodeyear+"_Bu2D0KHypo_Evts"]
-                                                                                    }
-    
-    configdict["GlobalVariables"]["Signal_Ipatia_BeautyMass_a1_"+samplemodeyear+"_Bu2D0PiHypo"] = {"Type": "RooRealVar",
-                                                                                                   "Title": r"a1^{\pi}_{B^{+}\to D^{0}\pi}",
-                                                                                                   "Range": [1.8226e+00],# 0.1, 20.0],
-                                                                                                   }
-    configdict["GlobalVariables"]["Signal_Ipatia_BeautyMass_a2_"+samplemodeyear+"_Bu2D0PiHypo"] = {"Type": "RooRealVar",
-                                                                                                   "Title": r"a2^{\pi}_{B^{+}\to D^{0}\pi}",
-                                                                                                   "Range": [2.5306e+00],# 0.1, 20.0],
-                                                                                                   }
-    configdict["GlobalVariables"]["Signal_Ipatia_BeautyMass_n1_"+samplemodeyear+"_Bu2D0PiHypo"] = {"Type": "RooRealVar",
-                                                                                                   "Title": r"n1^{\pi}_{B^{+}\to D^{0}\pi}",
-                                                                                                   "Range": [1.0520e+01],# 0.1, 20.0],
-                                                                                                   }
-    configdict["GlobalVariables"]["Signal_Ipatia_BeautyMass_n2_"+samplemodeyear+"_Bu2D0PiHypo"] = {"Type": "RooRealVar",
-                                                                                                   "Title": r"n2^{\pi}_{B^{+}\to D^{0}\pi}",
-                                                                                                   "Range": [5.2466e+00],# 0.1, 20.0],
-                                                                                                   }
-    configdict["GlobalVariables"]["Signal_Ipatia_BeautyMass_ascale_"+samplemodeyear+"_Bu2D0PiHypo"] = {"Type": "RooRealVar",
-                                                                                                       "Title": r"sa^{\pi}_{B^{+}\to D^{0}\pi}",
-                                                                                                       "Range": [1.0, 0.01, 10.0],
-                                                                                                       }
-    configdict["GlobalVariables"]["Signal_Ipatia_BeautyMass_nscale_"+samplemodeyear+"_Bu2D0PiHypo"] = {"Type": "RooRealVar",
-                                                                                                       "Title": r"sn^{\pi}_{B^{+}\to D^{0}\pi}",
-                                                                                                       "Range": [1.0, 0.01, 10.0],
-                                                                                                       }
-    configdict["GlobalVariables"]["Bd2D0PiPi_CBplusG_BeautyMass_sigmaCB_"+samplemodeyear+"_Bu2D0PiHypo"] = {"Type": "RooRealVar",
-                                                                                                            "Title": r"\sigmaCB^{\pi}_{\Bz\to D#pi#pi}",
-                                                                                                            "Range": [2.0029e+01],
-                                                                                                            }
-    configdict["GlobalVariables"]["Bd2D0PiPi_CBplusG_BeautyMass_sigmaG_"+samplemodeyear+"_Bu2D0PiHypo"] = {"Type": "RooRealVar",
-                                                                                                           "Title": r"\sigmaG^{\pi}_{\Bz\to D#pi#pi}",
-                                                                                                           "Range": [6.5132e+00],
-                                                                                                           }
-    
-    #PDF for each fitted component
-    #Structure: decay->hypo->observable
-    configdict["pdfList"] = {}
-    #
-    configdict["pdfList"]["Total"] = {}
-    configdict["pdfList"]["Total"]["Title"] = "Total"
-    configdict["pdfList"]["Total"]["Color"] = kBlue
-    configdict["pdfList"]["Total"]["Style"] = kSolid
-    #
-    configdict["pdfList"]["Signal"] = {}
-    configdict["pdfList"]["Signal"]["Title"] = "B_{u}#rightarrowD^{0}#pi"
-    configdict["pdfList"]["Signal"]["Color"] = kRed
-    configdict["pdfList"]["Signal"]["Style"] = kDashed
-    configdict["pdfList"]["Signal"]["Bu2D0Pi"] = {}
-    configdict["pdfList"]["Signal"]["Bu2D0Pi"]["BeautyMass"] = { "PDF"        : "Ipatia",
-                                                                 "shiftMean"  : False,
-                                                                 "scaleTails" : True,
-                                                                 "mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bu2D0PiHypo",
-                                                                 "sigma"      : {"par": [2.0653e+01, 1.5e+01, 3.5e+01],
-                                                                                 "title": r"\sigma^{\pi}_{B^{+}\to D^{0}\pi}"},
-                                                                 "zeta"       : {"par": [0.0],
-                                                                                 "title": r"\zeta^{\pi}_{B^{+}\to D^{0}\pi}"},
-                                                                 "fb"         : {"par": [0.0],
-                                                                                 "title": r"\beta^{\pi}_{B^{+}\to D^{0}\pi}"},
-                                                                 "l"          : {"par": [-3.4784e+00],
-                                                                                 "title" : "\lambda^{\pi}_{B^{+}\to D^{0}\pi}"},
-                                                                 "a1"         : "Signal_Ipatia_BeautyMass_a1_"+samplemodeyear+"_Bu2D0PiHypo", #left
-                                                                 "a2"         : "Signal_Ipatia_BeautyMass_a2_"+samplemodeyear+"_Bu2D0PiHypo", #right
-                                                                 "n1"         : "Signal_Ipatia_BeautyMass_n1_"+samplemodeyear+"_Bu2D0PiHypo", #left
-                                                                 "n2"         : "Signal_Ipatia_BeautyMass_a1_"+samplemodeyear+"_Bu2D0PiHypo"}#right
-    
-    configdict["pdfList"]["Signal"]["Bu2D0K"] = {}
-    configdict["pdfList"]["Signal"]["Bu2D0K"]["BeautyMass"] = { "PDF"        : "Ipatia",
-                                                                "shiftMean"  : False,
-                                                                "scaleTails" : False,
-                                                                "mean"       : {"par": [5.32185e+03,5.25e+03,5.45e+03],
-                                                                                "title" : r"\mu^{K}_{B^{+}\to D^{0}\pi}"},
-                                                                #"mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bu2D0KHypo",
-                                                                #"shift"      : {"par": [5.3219e+03-Kpeak],
-                                                                #                "title" : r"\Delta\mu^{K}_{B^{+}\to D^{0}\pi}"},
-                                                                "sigma"      : {"par": [1.9857e+01],
-                                                                                "title" : r"\sigma^{K}_{B^{+}\to D^{0}\pi}"},
-                                                                "zeta"       : {"par": [0.0],
-                                                                                "title" : r"\zeta^{K}_{B^{+}\to D^{0}\pi}"},
-                                                                "fb"         : {"par": [0.0],
-                                                                                "title" : r"\beta^{K}_{B^{+}\to D^{0}\pi}"},
-                                                                "l"          : {"par": [-1.9991e+01],
-                                                                                "title" : r"\lambda^{K}_{B^{+}\to D^{0}\pi}"},
-                                                                "a1"         : {"par": [3.0344e+00],
-                                                                                "title" : r"a1^{K}_{B^{+}\to D^{0}\pi}"},
-                                                                "a2"         : {"par": [5.1189e-01],
-                                                                                "title" : r"a2^{K}_{B^{+}\to D^{0}\pi}"},
-                                                                "n1"         : {"par": [1.9066e-04],
-                                                                                "title" : r"n1^{K}_{B^{+}\to D^{0}\pi}"},
-                                                                "n2"         : {"par": [2.8300e+00],
-                                                                                "title": r"n2^{K}_{B^{+}\to D^{0}\pi}"}}
-    #
-    configdict["pdfList"]["Bu2D0K"] = {}
-    configdict["pdfList"]["Bu2D0K"]["Title"] = "B_{u}#rightarrowD^{0}K"
-    configdict["pdfList"]["Bu2D0K"]["Color"] = kBlack
-    configdict["pdfList"]["Bu2D0K"]["Style"] = kDotted
-    configdict["pdfList"]["Bu2D0K"]["Bu2D0Pi"] = {}
-    configdict["pdfList"]["Bu2D0K"]["Bu2D0Pi"]["BeautyMass"] = { "PDF"        : "Ipatia",
-                                                                 "shiftMean"  : True,
-                                                                 "scaleTails" : False,
-                                                                 #"mean"       : {"par": [5.2424e+03, 5.15e+03,5.35e+03],
-                                                                 #                "title" : r"\mu^{\pi}_{B^{+}\to D^{0}K}"},
-                                                                 "mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bu2D0PiHypo",
-                                                                 "shift"      : {"par": [5242.88-Kpeak],
-                                                                                 "title" : r"\Delta\mu^{\pi}_{B^{+}\to D^{0}K}"},
-                                                                 "sigma"      : {"par": [2.2978e+01, 5.0, 8.0e+01],
-                                                                                 "title" : r"\sigma^{\pi}_{B^{+}\to D^{0}K}"},
-                                                                 "zeta"       : {"par" : [0.0],
-                                                                                 "title" : r"\zeta^{\pi}_{B^{+}\to D^{0}K}"},
-                                                                 "fb"         : {"par" : [0.0],
-                                                                                 "title" : r"\beta^{\pi}_{B^{+}\to D^{0}K}"},
-                                                                 "l"          : {"par": [-5.4990e+01],
-                                                                                 "title" : r"\lambda^{\pi}_{B^{+}\to D^{0}K}"},
-                                                                 "a1"         : {"par": [9.1449e-01],
-                                                                                 "title" : r"a1^{\pi}_{B^{+}\to D^{0}K}"},
-                                                                 "a2"         : {"par": [2.2018e+00],
-                                                                                 "title" : r"a2^{\pi}_{B^{+}\to D^{0}K}"},
-                                                                 "n1"         : {"par": [6.3048e+00],
-                                                                                 "title" : r"n1^{\pi}_{B^{+}\to D^{0}K}"},
-                                                                 "n2"         : {"par": [2.6233e+00],
-                                                                                 "title" : r"n2^{\pi}_{B^{+}\to D^{0}K}"}}
-    configdict["pdfList"]["Bu2D0K"]["Bu2D0K"] = {}
-    configdict["pdfList"]["Bu2D0K"]["Bu2D0K"]["BeautyMass"] = {"PDF"        : "Ipatia",
-                                                               "shiftMean"  : False,
-                                                               "scaleTails" : False,
-                                                               "mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bu2D0KHypo",
-                                                               "sigma"      : {"par": [1.6437e+01, 1.5e+01, 2.5e+01],
-                                                                               "title" : r"\sigma^{K}_{B^{+}\to D^{0}K}"},
-                                                               "zeta"       : {"par": [0.0],
-                                                                               "title" : r"\zeta^{K}_{B^{+}\to D^{0}K}"},
-                                                               "fb"         : {"par": [0.0],
-                                                                               "title" : r"\beta^{K}_{B^{+}\to D^{0}K}"},
-                                                               "l"          : {"par": [-2.8422e+00],
-                                                                               "title" : r"\lambda^{K}_{B^{+}\to D^{0}K}"},
-                                                               "a1"         : {"par": [2.8376e+00],
-                                                                               "title" : r"a1^{K}_{B^{+}\to D^{0}K}"},
-                                                               "a2"         : {"par": [1.0e+09],
-                                                                               "title" : r"a2^{K}_{B^{+}\to D^{0}K}"},
-                                                               "n1"         : {"par": [1.0583e+00],
-                                                                               "title" : r"n1^{K}_{B^{+}\to D^{0}K}"},
-                                                               "n2"         : {"par": [0.0],
-                                                                               "title" : r"n2^{K}_{B^{+}\to D^{0}K}"}}
-    #
-    configdict["pdfList"]["Bd2D0PiPi"] = {}
-    configdict["pdfList"]["Bd2D0PiPi"]["Title"] = "B_{d}#rightarrowD^{0}#pi#pi"
-    configdict["pdfList"]["Bd2D0PiPi"]["Color"] = kMagenta
-    configdict["pdfList"]["Bd2D0PiPi"]["Style"] = kDotted
-    configdict["pdfList"]["Bd2D0PiPi"]["Bu2D0Pi"] = {}
-    configdict["pdfList"]["Bd2D0PiPi"]["Bu2D0Pi"]["BeautyMass"] = {"PDF"        : "CrystalBallPlusGaussian",
-                                                                   "shiftMean"   : False,
-                                                                   "scaleWidths" : True,
-                                                                   "mean"       : {"par": [5.1345e+03, 5000, 5200],
-                                                                                   "title": r"\mu^{\pi}_{\Bz\to D#pi#pi}"},
-                                                                   #"mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bu2D0PiHypo",
-                                                                   #"shift"      : {"par": [5.1345e+03-Pipeak],
-                                                                   #                "title": r"\Delta\mu^{\pi}_{\Bz\to D#pi#pi}"},
-                                                                   "alpha"      : {"par": [-2.2268e+00],
-                                                                                   "title": r"\alpha^{\pi}_{\Bz\to D#pi#pi}"},
-                                                                   "n"          : {"par": [1.3541e+00],
-                                                                                   "title": r"n^{\pi}_{\Bz\to D#pi#pi}"},
-                                                                   "sigmaCB"    : "Bd2D0PiPi_CBplusG_BeautyMass_sigmaCB_"+samplemodeyear+"_Bu2D0PiHypo",
-                                                                   "sigmaG"     : "Bd2D0PiPi_CBplusG_BeautyMass_sigmaG_"+samplemodeyear+"_Bu2D0PiHypo",
-                                                                   "scaleSigma" : {"par": [1.0, 0.1, 2.0],
-                                                                                   "title": r"s\sigma^{\pi}_{\Bz\to D#pi#pi}"},
-                                                                   #"sigmaCB"    : {"par": [1.87014e+01, 5, 50],
-                                                                   #                "title": r"\sigmaCB^{\pi}_{\Bz\to D#pi#pi}"},
-                                                                   #"sigmaG"     : {"par": [2.93595e+01, 1, 60],
-                                                                   #                "title": r"\sigmaG^{\pi}_{\Bz\to D#pi#pi}"},
-                                                                   "fracG"      : {"par": [7.9824e-01],
-                                                                                   "title": r"f^{\pi}_{\Bz\to D#pi#pi}"}}
-    configdict["pdfList"]["Bd2D0PiPi"]["Bu2D0K"] = {}
-    configdict["pdfList"]["Bd2D0PiPi"]["Bu2D0K"]["BeautyMass"] = {"PDF"        : "None"}
-    '''
-    configdict["pdfList"]["Bd2D0PiPi"]["Bu2D0K"]["BeautyMass"] = {"PDF"        : "CrystalBallPlusExponential",
-                                                                  "shiftMean"  : True,
-                                                                  "mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bu2D0KHypo",
-                                                                  "shift"      : {"par": [5.15747e+03-Kpeak],
-                                                                                  "title": r"\Delta\mu^{K}_{\Bz\to D#pi#pi}"},
-                                                                  "alpha"      : {"par": [5.01769e-01],
-                                                                                  "title": r"\alpha^{K}_{\Bz\to D#pi#pi}"},
-                                                                  "n"          : {"par": [3.09581e-01],
-                                                                                  "title": r"n^{K}_{\Bz\to D#pi#pi}"},
-                                                                  "sigmaCB"    : {"par": [3.96301e+01],
-                                                                                  "title": r"\sigmaCB^{K}_{\Bz\to D#pi#pi}"},
-                                                                  "cB"         : {"par": [-6.49602e-03],
-                                                                                  "title": r"c^{K}_{\Bz\to D#pi#pi}"},
-                                                                  "fracExpo"   : {"par": [3.99999e-01],
-                                                                                  "title": r"f^{K}_{\Bz\to D#pi#pi}"}}
-    '''
-    #
-    configdict["pdfList"]["Bu2Dst0Pi"] = {}
-    configdict["pdfList"]["Bu2Dst0Pi"]["Title"] = "B_{u}#rightarrowD^{*0}#pi"
-    configdict["pdfList"]["Bu2Dst0Pi"]["Color"] = kOrange
-    configdict["pdfList"]["Bu2Dst0Pi"]["Style"] = kDotted
-    configdict["pdfList"]["Bu2Dst0Pi"]["Bu2D0Pi"] = {}
-    configdict["pdfList"]["Bu2Dst0Pi"]["Bu2D0Pi"]["BeautyMass"] = {"PDF"        : "JohnsonSUPlusGaussian",
-                                                                   "sameMean"   : False,
-                                                                   "shiftMean"  : True,
-                                                                   "meanJ"      : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bu2D0PiHypo",
-                                                                   "shift"      : {"par": [5.0408e+03-Pipeak],
-                                                                                   "title": r"\Delta\mu^{\pi}_{B^{+}\to D^{*0}\pi}"},
-                                                                   "sigmaJ"     : {"par": [3.7142e+02],
-                                                                                   "title": r"\sigmaJ^{\pi}_{B^{+}\to D^{*0}\pi}"},
-                                                                   "nuJ"        : {"par": [-1.4556e+00],
-                                                                                   "title": r"\nu^{\pi}_{B^{+}\to D^{*0}\pi}"},
-                                                                   "tauJ"       : {"par": [1.2958e+00],
-                                                                                   "title": r"\tauJ^{\pi}_{B^{+}\to D^{*0}\pi}"},
-                                                                   "meanGshift" : {"par": [9.1922e+01],
-                                                                                   "title": r"\delta\mu^{\pi}_{B^{+}\to D^{*0}\pi}"},
-                                                                   "sigmaG"     : {"par": [3.9943e+01],
-                                                                                   "title": r"\sigmaG^{\pi}_{B^{+}\to D^{*0}\pi}"},
-                                                                   "frac"       : {"par": [7.0497e-01],
-                                                                                   "title": r"f^{\pi}_{B^{+}\to D^{*0}\pi}"}
-                                                                   }
-    configdict["pdfList"]["Bu2Dst0Pi"]["Bu2D0K"] = {}
-    configdict["pdfList"]["Bu2Dst0Pi"]["Bu2D0K"]["BeautyMass"] = {"PDF"        : "CrystalBallPlusExponential",
-                                                                  "shiftMean"  : True,
-                                                                  "mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bu2D0KHypo",
-                                                                  "shift"      : {"par": [5.1932e+03-Kpeak],
-                                                                                  "title": r"\Delta\mu^{K}_{B^{+}\to D^{*0}\pi}"},
-                                                                  "alpha"      : {"par": [-1.1179e+01],
-                                                                                  "title": r"\alpha^{K}_{B^{+}\to D^{*0}\pi}"},
-                                                                  "n"          : {"par": [2.1586e+00],
-                                                                                  "title": r"n^{K}_{B^{+}\to D^{*0}\pi}"},
-                                                                  "sigmaCB"    : {"par": [5.9478e+01],
-                                                                                  "title": r"\sigmaCB^{K}_{B^{+}\to D^{*0}\pi}"},
-                                                                  "cB"         : {"par": [-7.5924e-03],
-                                                                                  "title": r"c^{K}_{B^{+}\to D^{*0}\pi}"},
-                                                                  "fracExpo"   : {"par": [3.8097e-01],
-                                                                                  "title": r"f^{K}_{B^{+}\to D^{*0}\pi}"}}
-    #
-    '''
-    configdict["pdfList"]["Bs2D0KPi"] = {}
-    configdict["pdfList"]["Bs2D0KPi"]["Title"] = "B_{s}#rightarrowD^{0}K#pi"
-    configdict["pdfList"]["Bs2D0KPi"]["Color"] = kGreen+3
-    configdict["pdfList"]["Bs2D0KPi"]["Style"] = kDotted
-    configdict["pdfList"]["Bs2D0KPi"]["Bu2D0Pi"] = {}
-    configdict["pdfList"]["Bs2D0KPi"]["Bu2D0Pi"]["BeautyMass"] = {"PDF"        : "JohnsonSU",
-                                                                  "shiftMean"  : True,
-                                                                  "mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bu2D0PiHypo",
-                                                                  "shift"      : {"par": [5.11599e+03-Pipeak],
-                                                                                  "title": r"\Delta\mu^{\pi}_{B^{0}_{s}\to D^{0}K\pi}"},
-                                                                  "sigma"      : {"par": [8.66345e+01],
-                                                                                  "title": r"\sigma^{\pi}_{B^{0}_{s}\to D^{0}K\pi}"},
-                                                                  "nu"         : {"par": [-1.85383e+00],
-                                                                                  "title": r"\nu^{\pi}_{B^{0}_{s}\to D^{0}K\pi}"},
-                                                                  "tau"        : {"par": [7.07216e-01],
-                                                                                  "title": r"\tau^{\pi}_{B^{0}_{s}\to D^{0}K\pi}"}}
-    configdict["pdfList"]["Bs2D0KPi"]["Bu2D0K"] = {}
-    configdict["pdfList"]["Bs2D0KPi"]["Bu2D0K"]["BeautyMass"] = {"PDF"        : "JohnsonSU",
-                                                                 "shiftMean"  : True,
-                                                                 "mean"       : "Signal_BeautyMass_mean_"+samplemodeyear+"_Bu2D0KHypo",
-                                                                 "shift"      : {"par": [5.05141e+03 -Pipeak],
-                                                                                 "title": r"\Delta\mu^{K}_{B^{0}_{s}\to D^{0}K\pi}"},
-                                                                 "sigma"      : {"par": [3.49927e+02],
-                                                                                 "title": r"\sigma^{K}_{B^{0}_{s}\to D^{0}K\pi}"},
-                                                                 "nu"         : {"par": [-1.86089e+00],
-                                                                                 "title": r"\nu^{K}_{B^{0}_{s}\to D^{0}K\pi}"},
-                                                                 "tau"        : {"par": [1.22910e+00],
-                                                                                  "title": r"\tau^{K}_{B^{0}_{s}\to D^{0}K\pi}"}}
-    '''
-    #
-    configdict["pdfList"]["Bu2DKst"] = {}
-    configdict["pdfList"]["Bu2DKst"]["Title"] = "B_{u}#rightarrowD^{0}K^{*}"
-    configdict["pdfList"]["Bu2DKst"]["Color"] = kPink
-    configdict["pdfList"]["Bu2DKst"]["Style"] = kDotted
-    configdict["pdfList"]["Bu2DKst"]["Bu2D0Pi"] = {}
-    configdict["pdfList"]["Bu2DKst"]["Bu2D0Pi"]["BeautyMass"] = {"PDF"      : "None"}
-    configdict["pdfList"]["Bu2DKst"]["Bu2D0K"] = {}
-    configdict["pdfList"]["Bu2DKst"]["Bu2D0K"]["BeautyMass"] = {"PDF"        : "Gaussian",
-                                                                "shiftMean"  : False,
-                                                                "mean"       : {"par": [4.8549e+03, 4600, 5100],
-                                                                                "title": "\mu^{K}_{B^{+}\to D^{0}K^{*}}"},
-                                                                "sigma"      : {"par": [1.0126e+02, 50, 200],
-                                                                                "title": "\sigma^{K}_{B^{+}\to D^{0}K^{*}}"}}
-    #
-    configdict["pdfList"]["Comb"] = {}
-    configdict["pdfList"]["Comb"]["Title"] = "Combinatorial"
-    configdict["pdfList"]["Comb"]["Color"] = kBlue
-    configdict["pdfList"]["Comb"]["Style"] = kDotted
-    configdict["pdfList"]["Comb"]["Bu2D0Pi"] = {}
-    #configdict["pdfList"]["Comb"]["Bu2D0Pi"]["BeautyMass"] = { "PDF"          : "DoubleExponential",
-    #                                                           "Title"        : "Combinatorial",
-    #                                                           "cB1"          : {"par": [-1.72409e-03, -15.0e-03, -1.0e-03],
-    #                                                                             "title" : r"c1^{\pi}_{\rm comb}"},
-    #                                                           "cB2"          : {"par": [-1.72409e-03, -15.0e-03, -1.0e-03],
-    #                                                                             "title" : r"c2^{\pi}_{\rm comb}"},
-    #                                                           "frac"         : {"par": [7.0e-01,0.01,1.0],
-    #                                                                             "title" : r"f^{\pi}_{\rm comb}"}}
-    configdict["pdfList"]["Comb"]["Bu2D0Pi"]["BeautyMass"] = { "PDF"          : "Exponential",
-                                                               "Title"        : "Combinatorial",
-                                                               "cB"           : {"par": [-1.72409e-03, -15.0e-03, -1.0e-03],
-                                                                                 "title" : r"c1^{\pi}_{\rm comb}"}}
-    
-    configdict["pdfList"]["Comb"]["Bu2D0K"] = {}
-    configdict["pdfList"]["Comb"]["Bu2D0K"]["BeautyMass"] = { "PDF"          : "Exponential",
-                                                              "Title"        : "Combinatorial",
-                                                              "cB"           : {"par": [-2.0e-03, -15.0e-03, -1.0e-03],
-                                                                                "title" : r"c^{K}_{\rm comb}"}}
-    #Axes titles
-    configdict["AxisTitle"] = {"BeautyMass": {"Bu2D0Pi":"D^{0}#pi mass (MeV/c^{2})",
-                                              "Bu2D0K":"D^{0}K mass (MeV/c^{2})"}}
-
-    #Range
-    configdict["Range"] = {"BeautyMass": {"Range": [configdict["BasicVariables"]["BeautyMass"]["Range"][0],
-                                                    configdict["BasicVariables"]["BeautyMass"]["Range"][1]],
-                                          "Bins": 227}}#455}}
-
-    #Range and sample for sWeights
-    configdict["sWeights"] = {"Hypo" : "Bu2D0Pi",
-                              "Range" : {"BeautyMass" : [5220.0, 5600.0] },
-                              "Bins"  : 190
-                              }
-
-    #Log scale
-    configdict["LogScale"] = {"BeautyMass": {"Bu2D0Pi" : [1e-03, 1e+05], "Bu2D0K" : [1e-01, 1e+04] } }
-
-    #Some coordinates
-    configdict["Legend"] = {"Xmin" : 0.6,
-                            "Ymin" : 0.2,
-                            "Xmax" : 0.89,
-                            "Ymax" : 0.6}
-    configdict["LHCbText"] = {"X"    : 0.89,
-                              "Y"    : 0.8,
-                              "Text" : "LHCb"}
-    configdict["Chi2"] = {"X"    : 0.6,
-                          "Y"    : 0.7}
-
-    #Yields
-    configdict["Yields"] = {"Signal"   : {"Bu2D0Pi"  : "nSig_"+samplemodeyear+"_Bu2D0PiHypo_Evts",
-                                          "Bu2D0K": "nSig_"+samplemodeyear+"_Bu2D0KHypo_Evts"},
-                            "Bu2D0K"    : {"Bu2D0Pi"  : "nBu2D0K_"+samplemodeyear+"_Bu2D0PiHypo_Evts",
-                                           "Bu2D0K": "nBu2D0K_"+samplemodeyear+"_Bu2D0KHypo_Evts"},
-                            "Bu2Dst0Pi"    : {"Bu2D0Pi"  : {"par": [1.0000e+04,0,300000],
-                                                            "title": r"N^{\pi}_{B^{+}\to D^{*0}\pi}"},
-                                              "Bu2D0K": {"par": [1.3533e+03,0,50000],
-                                                         "title": r"N^{K}_{B^{+}\to D^{*0}\pi}"}},
-                            "Bd2D0PiPi" : {"Bu2D0Pi"  : {"par": [7.4791e+03,0,100000],
-                                                         "title": r"N^{\pi}_{\Bz\to D^{0}\pi\pi}"},
-                                           "Bu2D0K": {"par": [0],#[18000,0,100000],
-                                                      "title": r"N^{K}_{\Bz\to D^{0}\pi\pi}"}},
-                            #"Bs2D0KPi" : {"Bu2D0Pi"  : {"par": [20000,0,100000],
-                            #                            "title": r"N^{\pi}_{B^{0}_{s}\to D^{0}K\pi}"},
-                            #              "Bu2D0K": {"par": [5000,0,50000],
-                            #                         "title": r"N^{K}_{B^{0}_{s}\to D^{0}K\pi}"}},
-                            "Bu2DKst" : {"Bu2D0Pi"  : {"par": [0],
-                                                       "title": r"N^{\pi}_{LM}"},
-                                         "Bu2D0K": {"par": [1.0948e+03,0,50000],
-                                                    "title": r"N^{K}_{LM}"}},
-                            "Comb"     : {"Bu2D0Pi"  : {"par": [4.7142e+04,0,600000],
-                                                        "title" : r"N^{\pi}_{\rm comb}"},
-                                          "Bu2D0K": {"par": [2.2488e+04,0,500000],
-                                                     "title" : r"N^{K}_{\rm comb}"},}}
-
-    #Gaussian constraints
-    #configdict["GaussianConstraints"] = {}
-    #configdict["GaussianConstraints"]["Eff_Bu2D0Pi_D0Pi"] = {"Parameters" : ["eff_Bu2D0Pi_D0Pi"],
-    #                                                         "Mean"       : [configdict["GlobalVariables"]["eff_Bu2D0Pi_D0Pi"]["Range"][0]],
-    #                                                         "Covariance" : [configdict["GlobalVariables"]["eff_Bu2D0Pi_D0Pi"]["Error"]]}
-    #configdict["GaussianConstraints"]["Eff_Bu2D0K_D0K"] = {"Parameters" : ["eff_Bu2D0K_D0K"],
-    #                                                       "Mean"       : [configdict["GlobalVariables"]["eff_Bu2D0K_D0K"]["Range"][0]],
-    #                                                       "Covariance" : [configdict["GlobalVariables"]["eff_Bu2D0K_D0K"]["Error"]]}
-
-    #Plot of the fit to compute sWeights
-    configdict["sWeightsFitPlot"] = {}
-    configdict["sWeightsFitPlot"]["Total"] = {"Color" : kBlue,
-                                              "Style" : kSolid,
-                                              "Title" : "Total"}
-    configdict["sWeightsFitPlot"]["Signal"] = {"Color" : kRed,
-                                               "Style" : kDashed,
-                                               "Title" : "Signal"}
-    configdict["sWeightsFitPlot"]["Background"] = {"Color" : kBlack,
-                                                   "Style" : kDotted,
-                                                   "Title" : "Background"}
-    
-    #sWeight plot
-    configdict["plotsWeights"] = {"CharmMass"  : "K#pi#pi mass (MeV/c^{2})"}
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/Bu2D0PiConfigForMassFit.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/Bu2D0PiConfigForMassFit.py
deleted file mode 100644
index 36566a5c73d8ab46fe0142e02d20d568feca8e4f..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/Bu2D0PiConfigForMassFit.py
+++ /dev/null
@@ -1,224 +0,0 @@
-from ROOT import *
-
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    import ROOT
-    from ROOT import *
-
-    happystar = "#lower[-0.65]{#scale[0.6]{*}}"
-
-    configdict["Decay"] = "Bu2D0Pi"
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5130,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_MM"}
-
-    configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1904    ],
-                                                      "Name"                   : "CharmMass",
-                                                      "InputName"              : "lab2_MM"}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.0004,     0.012    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "lab2_TAU"}
-    
-    configdict["BasicVariables"]["BacP"]          = { "Range"                  : [2000.0,  650000.0],
-                                                      "Name"                   : "BacP",
-                                                      "InputName"              : "lab1_P"}
-
-    configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-                                                      "Name"                   : "BacPT",
-                                                      "InputName"              : "lab1_PT"}
-
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0, 999.0     ],
-                                                      "Name"                   : "BacPIDK",
-                                                      "InputName"              : "lab1_PIDKcorr"}
-
-    configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-                                                      "Name"                   : "nTracks",
-                                                      "InputName"              : "nTracks"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_ID"}
-
-    #PDF for each fitted component
-    #Structure: decay->hypo->observable
-    configdict["pdfList"] = {}
-    #
-    configdict["pdfList"]["Signal"] = {}
-    configdict["pdfList"]["Signal"]["Bu2D0Pi"] = {}
-    configdict["pdfList"]["Signal"]["Bu2D0Pi"]["BeautyMass"] = { "PDF"        : "Ipatia",#"PDF"        : "IpatiaPlusJohnsonSU",
-                                                                 "Title"      : "B_{u}#rightarrowD^{0}#pi",
-                                                                 "Bins"       : 130,
-                                                                 "Min"        : 5190.0,
-                                                                 "Max"        : 5450.0,
-                                                                 "Unit"       : "MeV/c^{2}",
-                                                                 "mean"       : [5280,5200,5350],
-                                                                 "sigma"     : [25.0,1.0,100.0],#"sigmaI"     : [25.0,1.0,100.0],
-                                                                 #"sigmaJ"     : [25.0,1.0,100.0],
-                                                                 "zeta"       : [0.0],
-                                                                 "fb"         : [0.0],
-                                                                 "l"          : [-2.0,-25.0,-0.01],
-                                                                 "a1"         : [3.0,0.01,20.0],
-                                                                 "a2"         : [3.0,0.01,20.0],
-                                                                 "n1"         : [3.0,0.01,20.0],
-                                                                 "n2"         : [3.0,0.01,20.0]}#,
-                                                                 #"nu"         : [-0.1, -10.0, 0.0],
-                                                                 #"tau"        : [0.1, 0.0, 10.0],
-                                                                 #"fracI"      : [0.7, 0.1, 0.9]}
-    configdict["pdfList"]["Signal"]["Bu2D0K"] = {}
-    configdict["pdfList"]["Signal"]["Bu2D0K"]["BeautyMass"] = { "PDF"        : "Ipatia",
-                                                                "Title"      : "B_{u}#rightarrowD^{0}#pi",
-                                                                "Bins"       : 50,
-                                                                "Min"        : 5200.0,
-                                                                "Max"        : 5600.0,
-                                                                "Unit"       : "MeV/c^{2}",
-                                                                "mean"       : [5.3265e+03,5300.0,5400.0],
-                                                                "sigma"      : [2.1556e+01,10.0,50.0],
-                                                                "zeta"       : [0.0],
-                                                                "fb"         : [0.0],
-                                                                "l"          : [-6.9977e+00,-20.0,-1.0],
-                                                                "a1"         : [3.0,0.0,20.0],
-                                                                "a2"         : [3.0,0.0,20.0],
-                                                                "n1"         : [3.0,0.0,20.0],
-                                                                "n2"         : [3.0,0.0,20.0]}
-    #
-    configdict["pdfList"]["Bu2D0K"] = {}
-    configdict["pdfList"]["Bu2D0K"]["Bu2D0Pi"] = {}
-    configdict["pdfList"]["Bu2D0K"]["Bu2D0Pi"]["BeautyMass"] = { "PDF"        : "Ipatia",
-                                                                 "Title"      : "B_{u}#rightarrowD^{0}K",
-                                                                 "Bins"       : 82,
-                                                                 "Min"        : 5130.0,
-                                                                 "Max"        : 5500.0,
-                                                                 "Unit"       : "MeV/c^{2}",
-                                                                 "mean"       : [5239.0,5200.0,5250.0],
-                                                                 "sigma"      : [26.3,10.0,50.0],
-                                                                 "zeta"       : [0.0],
-                                                                 "fb"         : [0.0],
-                                                                 "l"          : [-28.0,-55.0,-5.0],
-                                                                 "a1"         : [0.96,0.01,25.0],
-                                                                 "a2"         : [1.23,0.01,25.0],
-                                                                 "n1"         : [3.5,0.01,20.0],
-                                                                 "n2"         : [10.0,0.01,25.0]}
-    configdict["pdfList"]["Bu2D0K"]["Bu2D0K"] = {}
-    configdict["pdfList"]["Bu2D0K"]["Bu2D0K"]["BeautyMass"] = { "PDF"        : "Ipatia",
-                                                                "Title"      : "B_{u}#rightarrowD^{0}K",
-                                                                "Bins"       : 80,
-                                                                "Min"        : 5130.0,#5200.0,
-                                                                "Max"        : 5500.0,#5380.0,
-                                                                "Unit"       : "MeV/c^{2}",
-                                                                "mean"       : [5280.0,5200.0,5350.0],
-                                                                "sigma"      : [17.0,5.0,50.0],
-                                                                "zeta"       : [0.0],
-                                                                "fb"         : [0.0],
-                                                                "l"          : [-3.6,-15.0,-0.01],
-                                                                "a1"         : [2.6,1.0,10.0],
-                                                                "a2"         : [1e+09],
-                                                                "n1"         : [0.95,0.001,15.0],
-                                                                "n2"         : [0.0]}
-    #
-    configdict["pdfList"]["Bd2D0PiPi"] = {}
-    configdict["pdfList"]["Bd2D0PiPi"]["Bu2D0Pi"] = {}
-    configdict["pdfList"]["Bd2D0PiPi"]["Bu2D0Pi"]["BeautyMass"] = {"PDF"        : "CrystalBallPlusGaussian",
-                                                                   "Title"      : "B_{d}#rightarrowD^{0}#pi#pi",
-                                                                   "Bins"       : 100,
-                                                                   "Min"        : 5130.0,
-                                                                   "Max"        : 5400.0,
-                                                                   "Unit"       : "MeV/c^{2}",
-                                                                   "shiftMean"  : False,
-                                                                   "mean"       : [5100.92,4000.0,5500.0],
-                                                                   "alpha"      : [-2.181,-10.0,10.0],
-                                                                   "n"          : [1.08,0.0,10.0],
-                                                                   "sigmaG"     : [4.97869e+01,1.0,100.0],
-                                                                   "sigmaCB"    : [4.97869e+01,1.0,100.0],
-                                                                   "fracG"      : [3.00000e-01,0.1,0.9]}
-    configdict["pdfList"]["Bd2D0PiPi"]["Bu2D0K"] = {}
-    configdict["pdfList"]["Bd2D0PiPi"]["Bu2D0K"]["BeautyMass"] = {"PDF"        : "CrystalBallPlusExponential",
-                                                                  "Title"      : "B_{d}#rightarrowD^{0}#pi#pi",
-                                                                  "Bins"       : 50,
-                                                                  "Min"        : 5130.0,
-                                                                  "Max"        : 5400.0,
-                                                                  "Unit"       : "MeV/c^{2}",
-                                                                  "shiftMean"  : False,
-                                                                  "mean"       : [5.14823e+03,5100.0,5250.0],
-                                                                  "alpha"      : [1.00834e+00,0.5,10.0],
-                                                                  "n"          : [7.52737e-01,0.3,15],
-                                                                  "sigmaCB"    : [4.97869e+01,1.0,60.0],
-                                                                  "cB"         : [-3.83778e-03,-10.0,0],
-                                                                  "fracExpo"   : [3.00000e-01,0.1,0.9]}
-    #
-    configdict["pdfList"]["Bu2Dst0Pi"] = {}
-    configdict["pdfList"]["Bu2Dst0Pi"]["Bu2D0Pi"] = {}
-    configdict["pdfList"]["Bu2Dst0Pi"]["Bu2D0Pi"]["BeautyMass"] = {"PDF"        : "JohnsonSUPlusGaussian",
-                                                                   "Title"      : "B_{u}#rightarrowD"+happystar+"^{0}#pi",
-                                                                   "Bins"       : 100,
-                                                                   "Min"        : 5130.0,
-                                                                   "Max"        : 5700.0,
-                                                                   "Unit"       : "MeV/c^{2}",
-                                                                   "sameMean"   : False,
-                                                                   "meanJ"      : [5.02862e+03,4950.0,5050.0],
-                                                                   "sigmaJ"     : [2.76206e+02, 20.0, 500.0],
-                                                                   "nuJ"        : [-1.81599e+00, -20, 0.0],
-                                                                   "tauJ"       : [1.04801e+00, 0.1, 20.0],
-                                                                   "meanGshift" : [9.40469e+01, 10.0, 200.0],
-                                                                   "sigmaG"     : [4.01146e+01, 10.0, 200.0],
-                                                                   "frac"       : [4.91253e-01, 0.1, 0.9]
-                                                                   }
-    
-    configdict["pdfList"]["Bu2Dst0Pi"]["Bu2D0K"] = {}
-    configdict["pdfList"]["Bu2Dst0Pi"]["Bu2D0K"]["BeautyMass"] = {"PDF"        : "CrystalBallPlusExponential",
-                                                                  "Title"      : "B_{u}#rightarrowD"+happystar+"^{0}#pi",
-                                                                  "Bins"       : 50,
-                                                                  "Min"        : 5130.0,
-                                                                  "Max"        : 5700.0,
-                                                                  "Unit"       : "MeV/c^{2}",
-                                                                  "shiftMean"  : False,
-                                                                  "mean"       : [5.17562e+03,5000.0,5250.0],
-                                                                  "alpha"      : [-4.97466e+00,-20,-1.0],
-                                                                  "n"          : [3.49986e-01,0.01,15],
-                                                                  "sigmaCB"      : [6.74593e+01,5.0,200.0],
-                                                                  "cB"         : [-6.53729e-03,-10.0,0],
-                                                                  "fracExpo"   : [2.99572e-01,0.01,0.99]}
-    #
-    configdict["pdfList"]["Bs2D0KPi"] = {}
-    configdict["pdfList"]["Bs2D0KPi"]["Bu2D0Pi"] = {}
-    configdict["pdfList"]["Bs2D0KPi"]["Bu2D0Pi"]["BeautyMass"] = {"PDF"        : "JohnsonSU",
-                                                                  "Title"      : "B_{s}#rightarrowD^{0}K#pi",
-                                                                  "Bins"       : 100,
-                                                                  "Min"        : 5130.0,
-                                                                  "Max"        : 5300.0,
-                                                                  "Unit"       : "MeV/c^{2}",
-                                                                  "mean"       : [5100.92,5000.0,5200.0],
-                                                                  "sigma"      : [600, 10.0, 1000.0],
-                                                                  "nu"         : [-1.9084e+00, -20.8, -1.0],
-                                                                  "tau"        : [1.3406e+00, 0.1, 15]}
-    configdict["pdfList"]["Bs2D0KPi"]["Bu2D0K"] = {}
-    configdict["pdfList"]["Bs2D0KPi"]["Bu2D0K"]["BeautyMass"] = {"PDF"        : "JohnsonSU",
-                                                                 "Title"      : "B_{s}#rightarrowD^{0}K#pi",
-                                                                 "Bins"       : 100,
-                                                                 "Min"        : 5130.0,
-                                                                 "Max"        : 5300.0,
-                                                                 "Unit"       : "MeV/c^{2}",
-                                                                 "mean"       : [5080,5000.0,5150.0],
-                                                                 "sigma"      : [260, 10.0, 500.0],
-                                                                 "nu"         : [-1.86e+00, -15.0, 0.0],
-                                                                 "tau"        : [1.15e+00, 0.01, 15.0]}
-
-    #Dataset prefix
-    configdict["dataSetPrefix"] = {"Signal"   : "dataSetMC_Bu2D0Pi_",
-                                   "Bu2D0K"    : "dataSetMC_Bu2D0K_",
-                                   "Bd2D0PiPi" : "dataSetMC_Bd2D0PiPi_",
-                                   "Bu2Dst0Pi" : "dataSetMC_Bu2Dst0Pi_",
-                                   "Bs2D0KPi"  : "dataSetMC_Bs2D0KPi_"}
-    #Axes titles
-    configdict["AxisTitle"] = {"BeautyMass": {"Bu2D0Pi":"D^{0}#pi mass (MeV/c^{2})","Bu2D0K":"D^{0}K mass (MeV/c^{2})"}}
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/Bu2D0PiConfigForWorkspace_KHypo_Data.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/Bu2D0PiConfigForWorkspace_KHypo_Data.py
deleted file mode 100644
index 6556e14d29dd675d4cb01b06bd9321b6dd683b09..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/Bu2D0PiConfigForWorkspace_KHypo_Data.py
+++ /dev/null
@@ -1,125 +0,0 @@
-from ROOT import *
-
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bu2D0Pi"
-    # PIDK for bachelor
-    configdict["BachelorHypo"] = "Bu2D0K"
-    configdict["CharmModes"] = {"KPi"} 
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2011","2012"} 
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "/afs/cern.ch/user/v/vibattis/cmtuser/UraniaDev_v6r2p1/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/config_Bu2D0Pi.txt"
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5130,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_MM"}
-
-    configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1904    ],
-                                                      "Name"                   : "CharmMass",
-                                                      "InputName"              : "lab2_MM"}
-
-    #configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.0004,     0.012    ],
-    #                                                  "Bins"                   : 40,
-    #                                                  "Name"                   : "BeautyTime",
-    #                                                  "InputName"              : "lab0_TAU"}
-    
-    configdict["BasicVariables"]["BacP"]          = { "Range"                  : [2000.0,  650000.0],
-                                                      "Name"                   : "BacP",
-                                                      "InputName"              : "lab1_P"}
-
-    configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-                                                      "Name"                   : "BacPT",
-                                                      "InputName"              : "lab1_PT"}
-
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0,    999.0     ],
-                                                      "Name"                   : "BacPIDK",
-                                                      "InputName"              : "lab1_PIDK"}
-
-    configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-                                                      "Name"                   : "nTracks",
-                                                      "InputName"              : "nTracks"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_ID"}
-
-    configdict["BasicVariables"]["TagDecOSComb"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                          "Name"                   : "TagDecOSCharm",
-                                                          "InputName"              : "lab0_TAGDECISION_OS"}
-
-    configdict["BasicVariables"]["TagDecOSCharm"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                           "Name"                   : "TagDecOSCharm",
-                                                           "InputName"              : "lab0_OS_Charm_DEC"}
-
-    configdict["BasicVariables"]["MistagOSComb"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                          "Name"                   : "MistagOSComb",
-                                                          "InputName"              : "lab0_TAGOMEGA_OS"}
-
-    configdict["BasicVariables"]["MistagOSCharm"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                           "Name"                   : "MistagOSCharm",
-                                                           "InputName"              : "lab0_OS_Charm_PROB"}
-
-    #Additional variables not foreseen before
-    configdict["AdditionalVariables"] = {}
-
-    configdict["AdditionalVariables"]["BeautyID"]      = { "Range"                  : [ -1000.,    1000.     ],
-                                                           "Name"                   : "BeautyID",
-                                                           "InputName"              : "lab0_ID"}
-    
-    configdict["AdditionalVariables"]["BeautyPhi"]      = { "Range"                  : [ -10.,    10.     ],
-                                                            "Name"                   : "BeautyPhi",
-                                                            "InputName"              : "lab0_LOKI_PHI"}
-    
-    configdict["AdditionalVariables"]["BeautyEta"]      = { "Range"                  : [ 1.5,    10.0     ],
-                                                            "Name"                   : "BeautyEta",
-                                                            "InputName"              : "lab0_LOKI_ETA"}
-    
-    configdict["AdditionalVariables"]["BeautyPT"]      = { "Range"                  : [ 0.0,    100000     ],
-                                                           "Name"                   : "BeautyPT",
-                                                           "InputName"              : "lab0_PT"}
-
-    configdict["AdditionalVariables"]["BeautyP"]      = { "Range"                  : [ 0.0,    3000000     ],
-                                                          "Name"                   : "BeautyP",
-                                                          "InputName"              : "lab0_P"}
-
-    configdict["AdditionalVariables"]["CharmTime"]    = { "Range"                  : [-10,     10    ],
-                                                          "Name"                   : "CharmTime",
-                                                          "InputName"              : "lab2_TAU"}
-
-    configdict["AdditionalVariables"]["BeautyTimeScaled"]    = { "Range"                  : [0.0004,     0.012    ],
-                                                                 "Bins"                   : 40,
-                                                                 "Name"                   : "BeautyTimeScaled",
-                                                                 "InputName"              : "lab0_TAU"}
-    
-    
-    configdict["AdditionalVariables"]["nPV"]      = { "Range"                  : [ 0.0,    10     ],
-                                                      "Name"                   : "nPV",
-                                                      "InputName"              : "nPV"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo2BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo2BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo2BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo3BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo3BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo3BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo4BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0    ],
-                                                                                "Name"                   : "Hlt2Topo4BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo4BodyBBDTDecision_TOS"}
-
-    # PIDK bin
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"] = {"Data": "lab1_PIDK>5.0 && (lab0_TAGDECISION_OS!=0 || lab0_OS_Charm_DEC!=0) && lab0_TAU>=0.0004 && lab0_TAU<=0.012 && lab0_MM>5130 && lab0_MM<6000 && nTracks>15 && nTracks<1000 && lab2_MM>1830 && lab2_MM<1904 && lab1_P>2000 && lab1_P<650000 && lab1_PT>400 && lab1_PT<45000 && lab0_LOKI_PHI>-10 && lab0_LOKI_PHI<10 && lab0_LOKI_ETA>1.5 && lab0_LOKI_ETA<10 && lab0_P>0 && lab0_P<3000000 && lab0_PT>0 && lab0_PT<100000 && (lab0_Hlt2Topo2BodyBBDTDecision_TOS!=0 || lab0_Hlt2Topo3BodyBBDTDecision_TOS!=0 || lab0_Hlt2Topo4BodyBBDTDecision_TOS!=0)"}
-
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/Bu2D0PiConfigForWorkspace_KHypo_MC.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/Bu2D0PiConfigForWorkspace_KHypo_MC.py
deleted file mode 100644
index 4fc282f8a1fb2ed42e3b55399c76a209bb64ef95..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/Bu2D0PiConfigForWorkspace_KHypo_MC.py
+++ /dev/null
@@ -1,119 +0,0 @@
-from ROOT import *
-
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bu2D0Pi"
-    # PIDK for bachelor
-    configdict["BachelorHypo"] = "Bu2D0K"
-    configdict["CharmModes"] = {"KPi"} 
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2011","2012"} 
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "/afs/cern.ch/user/v/vibattis/cmtuser/UraniaDev_v6r2p1/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/config_Bu2D0Pi.txt"
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5130,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_MM"}
-
-    configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1904    ],
-                                                      "Name"                   : "CharmMass",
-                                                      "InputName"              : "lab2_MM"}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.0004,     0.012    ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "lab0_TAU"}
-    
-    configdict["BasicVariables"]["BacP"]          = { "Range"                  : [2000.0,  650000.0],
-                                                      "Name"                   : "BacP",
-                                                      "InputName"              : "lab1_P"}
-
-    configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-                                                      "Name"                   : "BacPT",
-                                                      "InputName"              : "lab1_PT"}
-
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0,    999.0     ],
-                                                      "Name"                   : "BacPIDK",
-                                                      "InputName"              : "lab1_PIDKcorr"}
-
-    configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-                                                      "Name"                   : "nTracks",
-                                                      "InputName"              : "nTracks"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_TRUEID"}
-
-    configdict["BasicVariables"]["TagDecOSComb"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                          "Name"                   : "TagDecOSCharm",
-                                                          "InputName"              : "lab0_TAGDECISION_OS"}
-
-    configdict["BasicVariables"]["TagDecOSCharm"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                           "Name"                   : "TagDecOSCharm",
-                                                           "InputName"              : "lab0_OS_Charm_DEC"}
-
-    configdict["BasicVariables"]["MistagOSComb"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                          "Name"                   : "MistagOSComb",
-                                                          "InputName"              : "lab0_TAGOMEGA_OS"}
-
-    configdict["BasicVariables"]["MistagOSCharm"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                           "Name"                   : "MistagOSCharm",
-                                                           "InputName"              : "lab0_OS_Charm_PROB"}
-
-    #Additional variables not foreseen before
-    configdict["AdditionalVariables"] = {}
-
-    configdict["AdditionalVariables"]["BeautyID"]      = { "Range"                  : [ -1000.,    1000.     ],
-                                                           "Name"                   : "BeautyID",
-                                                           "InputName"              : "lab0_TRUEID"}
-    
-    configdict["AdditionalVariables"]["BeautyPhi"]      = { "Range"                  : [ -10.,    10.     ],
-                                                            "Name"                   : "BeautyPhi",
-                                                            "InputName"              : "lab0_LOKI_PHI"}
-    
-    configdict["AdditionalVariables"]["BeautyEta"]      = { "Range"                  : [ 1.5,    10.0     ],
-                                                            "Name"                   : "BeautyEta",
-                                                            "InputName"              : "lab0_LOKI_ETA"}
-    
-    configdict["AdditionalVariables"]["BeautyPT"]      = { "Range"                  : [ 0.0,    100000     ],
-                                                           "Name"                   : "BeautyPT",
-                                                           "InputName"              : "lab0_PT"}
-
-    configdict["AdditionalVariables"]["BeautyP"]      = { "Range"                  : [ 0.0,    3000000     ],
-                                                          "Name"                   : "BeautyP",
-                                                          "InputName"              : "lab0_P"}
-
-    configdict["AdditionalVariables"]["CharmTime"]    = { "Range"                  : [-10,     10    ],
-                                                          "Name"                   : "CharmTime",
-                                                          "InputName"              : "lab2_TAU"}
-    
-    configdict["AdditionalVariables"]["nPV"]      = { "Range"                  : [ 0.0,    10     ],
-                                                      "Name"                   : "nPV",
-                                                      "InputName"              : "nPV"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo2BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo2BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo2BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo3BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo3BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo3BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo4BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0    ],
-                                                                                "Name"                   : "Hlt2Topo4BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo4BodyBBDTDecision_TOS"}
-
-    # PIDK bin
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"] = {"MC": "lab1_PIDKcorr>5.0&&lab0_BKGCAT<60 && (lab0_TAGDECISION_OS!=0 || lab0_OS_Charm_DEC!=0) && lab0_TAU>=0.0004 && lab0_TAU<=0.012 && lab0_MM>5130 && lab0_MM<6000 && nTracks>15 && nTracks<1000 && lab2_MM>1830 && lab2_MM<1904 && lab1_P>2000 && lab1_P<650000 && lab1_PT>400 && lab1_PT<45000 && lab0_LOKI_PHI>-10 && lab0_LOKI_PHI<10 && lab0_LOKI_ETA>1.5 && lab0_LOKI_ETA<10 && lab0_P>0 && lab0_P<3000000 && lab0_PT>0 && lab0_PT<100000 && (lab0_Hlt2Topo2BodyBBDTDecision_TOS!=0 || lab0_Hlt2Topo3BodyBBDTDecision_TOS!=0 || lab0_Hlt2Topo4BodyBBDTDecision_TOS!=0)"}
-
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/Bu2D0PiConfigForWorkspace_PiHypo_Data.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/Bu2D0PiConfigForWorkspace_PiHypo_Data.py
deleted file mode 100644
index 83ee004375b61774c67197f36f127f02449e050c..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/Bu2D0PiConfigForWorkspace_PiHypo_Data.py
+++ /dev/null
@@ -1,126 +0,0 @@
-from ROOT import *
-
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bu2D0Pi"
-    # PIDK for bachelor
-    configdict["BachelorHypo"] = "Bu2D0Pi"
-    configdict["CharmModes"] = {"KPi"} 
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2011","2012"} 
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "/afs/cern.ch/user/v/vibattis/cmtuser/UraniaDev_v6r2p1/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/config_Bu2D0Pi.txt"
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5130,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_MM"}
-
-    configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1904    ],
-                                                      "Name"                   : "CharmMass",
-                                                      "InputName"              : "lab2_MM"}
-
-    #configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.0004,     0.012    ],
-    #                                                  "Bins"                   : 40,
-    #                                                  "Name"                   : "BeautyTime",
-    #                                                  "InputName"              : "lab0_TAU"}
-    
-    configdict["BasicVariables"]["BacP"]          = { "Range"                  : [2000.0,  650000.0],
-                                                      "Name"                   : "BacP",
-                                                      "InputName"              : "lab1_P"}
-
-    configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-                                                      "Name"                   : "BacPT",
-                                                      "InputName"              : "lab1_PT"}
-
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0,    999.0     ],
-                                                      "Name"                   : "BacPIDK",
-                                                      "InputName"              : "lab1_PIDK"}
-
-    configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-                                                      "Name"                   : "nTracks",
-                                                      "InputName"              : "nTracks"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_ID"}
-
-    configdict["BasicVariables"]["TagDecOSComb"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                          "Name"                   : "TagDecOSCharm",
-                                                          "InputName"              : "lab0_TAGDECISION_OS"}
-
-    configdict["BasicVariables"]["TagDecOSCharm"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                           "Name"                   : "TagDecOSCharm",
-                                                           "InputName"              : "lab0_OS_Charm_DEC"}
-    
-    configdict["BasicVariables"]["MistagOSComb"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                          "Name"                   : "MistagOSComb",
-                                                          "InputName"              : "lab0_TAGOMEGA_OS"}
-
-    configdict["BasicVariables"]["MistagOSCharm"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                           "Name"                   : "MistagOSCharm",
-                                                           "InputName"              : "lab0_OS_Charm_PROB"}
-
-    #Additional variables not foreseen before
-    configdict["AdditionalVariables"] = {}
-
-    configdict["AdditionalVariables"]["BeautyID"]      = { "Range"                  : [ -1000.,    1000.     ],
-                                                           "Name"                   : "BeautyID",
-                                                           "InputName"              : "lab0_ID"}
-    
-    configdict["AdditionalVariables"]["BeautyPhi"]      = { "Range"                  : [ -10.,    10.     ],
-                                                            "Name"                   : "BeautyPhi",
-                                                            "InputName"              : "lab0_LOKI_PHI"}
-    
-    configdict["AdditionalVariables"]["BeautyEta"]      = { "Range"                  : [ 1.5,    10.0     ],
-                                                            "Name"                   : "BeautyEta",
-                                                            "InputName"              : "lab0_LOKI_ETA"}
-    
-    configdict["AdditionalVariables"]["BeautyPT"]      = { "Range"                  : [ 0.0,    100000     ],
-                                                           "Name"                   : "BeautyPT",
-                                                           "InputName"              : "lab0_PT"}
-
-    configdict["AdditionalVariables"]["BeautyP"]      = { "Range"                  : [ 0.0,    3000000     ],
-                                                          "Name"                   : "BeautyP",
-                                                          "InputName"              : "lab0_P"}
-
-    configdict["AdditionalVariables"]["CharmTime"]    = { "Range"                  : [-10,     10    ],
-                                                          "Name"                   : "CharmTime",
-                                                          "InputName"              : "lab2_TAU"}
-
-    configdict["AdditionalVariables"]["BeautyTimeScaled"]    = { "Range"                  : [0.0004,     0.012    ],
-                                                                 "Bins"                   : 40,
-                                                                 "Name"                   : "BeautyTimeScaled",
-                                                                 "InputName"              : "lab0_TAU"}
-    
-    
-    configdict["AdditionalVariables"]["nPV"]      = { "Range"                  : [ 0.0,    10     ],
-                                                      "Name"                   : "nPV",
-                                                      "InputName"              : "nPV"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo2BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo2BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo2BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo3BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo3BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo3BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo4BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0    ],
-                                                                                "Name"                   : "Hlt2Topo4BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo4BodyBBDTDecision_TOS"}
-
-
-    # PIDK bin
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"] = {"Data": "lab1_PIDK<5.0 && (lab0_TAGDECISION_OS!=0 || lab0_OS_Charm_DEC!=0) && lab0_TAU>=0.0004 && lab0_TAU<=0.012 && lab0_MM>5130 && lab0_MM<6000 && nTracks>15 && nTracks<1000 && lab2_MM>1830 && lab2_MM<1904 && lab1_P>2000 && lab1_P<650000 && lab1_PT>400 && lab1_PT<45000 && lab0_LOKI_PHI>-10 && lab0_LOKI_PHI<10 && lab0_LOKI_ETA>1.5 && lab0_LOKI_ETA<10 && lab0_P>0 && lab0_P<3000000 && lab0_PT>0 && lab0_PT<100000 && (lab0_Hlt2Topo2BodyBBDTDecision_TOS!=0 || lab0_Hlt2Topo3BodyBBDTDecision_TOS!=0 || lab0_Hlt2Topo4BodyBBDTDecision_TOS!=0)"}
-
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/Bu2D0PiConfigForWorkspace_PiHypo_MC.py b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/Bu2D0PiConfigForWorkspace_PiHypo_MC.py
deleted file mode 100644
index a3a678f238b71e086b5ad54e0eef95e4b7006636..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/Bu2D0PiConfigForWorkspace_PiHypo_MC.py
+++ /dev/null
@@ -1,124 +0,0 @@
-from ROOT import *
-
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bu2D0Pi"
-    # PIDK for bachelor
-    configdict["BachelorHypo"] = "Bu2D0Pi"
-    configdict["CharmModes"] = {"KPi"} 
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2011","2012"} 
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "/afs/cern.ch/user/v/vibattis/cmtuser/UraniaDev_v6r2p1/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/config_Bu2D0Pi.txt"
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5130,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_MM"}
-
-    configdict["BasicVariables"]["CharmMass"]     = { "Range"                  : [1830,    1904    ],
-                                                      "Name"                   : "CharmMass",
-                                                      "InputName"              : "lab2_MM"}
-
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range"                  : [0.0004,   0.012      ],
-                                                      "Bins"                   : 40,
-                                                      "Name"                   : "BeautyTime",
-                                                      "InputName"              : "lab0_TAU"}
-
-    configdict["BasicVariables"]["BacP"]          = { "Range"                  : [2000.0,  650000.0],
-                                                      "Name"                   : "BacP",
-                                                      "InputName"              : "lab1_P"}
-
-    configdict["BasicVariables"]["BacPT"]         = { "Range"                  : [400.0,   45000.0 ],
-                                                      "Name"                   : "BacPT",
-                                                      "InputName"              : "lab1_PT"}
-
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range"                  : [-999.0,    999.0     ],
-                                                      "Name"                   : "BacPIDK",
-                                                      "InputName"              : "lab1_PIDKcorr"}
-
-    configdict["BasicVariables"]["nTracks"]       = { "Range"                  : [15.0,    1000.0  ],
-                                                      "Name"                   : "nTracks",
-                                                      "InputName"              : "nTracks"}
-
-    configdict["BasicVariables"]["BacCharge"]     = { "Range"                  : [-1000.0, 1000.0  ],
-                                                      "Name"                   : "BacCharge",
-                                                      "InputName"              : "lab1_TRUEID"}
-    
-    configdict["BasicVariables"]["TagDecOSComb"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                          "Name"                   : "TagDecOSCharm",
-                                                          "InputName"              : "lab0_TAGDECISION_OS"}
-
-    configdict["BasicVariables"]["TagDecOSCharm"]      = { "Range"                  : [-1.0,    1.0     ],
-                                                           "Name"                   : "TagDecOSCharm",
-                                                           "InputName"              : "lab0_OS_Charm_DEC"}
-    
-    configdict["BasicVariables"]["MistagOSComb"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                          "Name"                   : "MistagOSComb",
-                                                          "InputName"              : "lab0_TAGOMEGA_OS"}
-
-    configdict["BasicVariables"]["MistagOSCharm"]      = { "Range"                  : [ 0.0,    0.5     ],
-                                                           "Name"                   : "MistagOSCharm",
-                                                           "InputName"              : "lab0_OS_Charm_PROB"}
-
-    #Additional variables not foreseen before
-    configdict["AdditionalVariables"] = {}
-
-    configdict["AdditionalVariables"]["BeautyID"]      = { "Range"                  : [ -1000.,    1000.     ],
-                                                           "Name"                   : "BeautyID",
-                                                           "InputName"              : "lab0_TRUEID"}
-    
-    configdict["AdditionalVariables"]["BeautyPhi"]      = { "Range"                  : [ -10.,    10.     ],
-                                                            "Name"                   : "BeautyPhi",
-                                                            "InputName"              : "lab0_LOKI_PHI"}
-    
-    configdict["AdditionalVariables"]["BeautyEta"]      = { "Range"                  : [ 1.5,    10.0     ],
-                                                            "Name"                   : "BeautyEta",
-                                                            "InputName"              : "lab0_LOKI_ETA"}
-    
-    configdict["AdditionalVariables"]["BeautyPT"]      = { "Range"                  : [ 0.0,    100000     ],
-                                                           "Name"                   : "BeautyPT",
-                                                           "InputName"              : "lab0_PT"}
-
-    configdict["AdditionalVariables"]["BeautyP"]      = { "Range"                  : [ 0.0,    3000000     ],
-                                                          "Name"                   : "BeautyP",
-                                                          "InputName"              : "lab0_P"}
-
-    configdict["AdditionalVariables"]["CharmTime"]    = { "Range"                  : [-10,     10    ],
-                                                          "Name"                   : "CharmTime",
-                                                          "InputName"              : "lab2_TAU"}
-    
-    configdict["AdditionalVariables"]["nPV"]      = { "Range"                  : [ 0.0,    10     ],
-                                                      "Name"                   : "nPV",
-                                                      "InputName"              : "nPV"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo2BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo2BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo2BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo3BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0     ],
-                                                                                "Name"                   : "Hlt2Topo3BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo3BodyBBDTDecision_TOS"}
-
-    configdict["AdditionalVariables"]["Hlt2Topo4BodyBBDTDecision_TOS"]      = { "Range"                  : [ 0.0,    1.0    ],
-                                                                                "Name"                   : "Hlt2Topo4BodyBBDTDecision_TOS",
-                                                                                "InputName"              : "lab0_Hlt2Topo4BodyBBDTDecision_TOS"}
-    
-    configdict["AdditionalVariables"]["TriggerCategoryBroad"]      = { "Range"                  : [ 0.0,    10     ],
-                                                                       "Name"                   : "TriggerCategoryBroad",
-                                                                       "InputName"              : "TriggerCategoryBroad"}
-
-    # PIDK bin
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"] = {"MC": "lab1_PIDKcorr<5.0&&lab0_BKGCAT<60 && (lab0_TAGDECISION_OS!=0 || lab0_OS_Charm_DEC!=0) &&  lab0_TAU>=0.0004 && lab0_TAU<=0.012 && lab0_MM>5130 && lab0_MM<6000 && nTracks>15 && nTracks<1000 && lab2_MM>1830 && lab2_MM<1904 && lab1_P>2000 && lab1_P<650000 && lab1_PT>400 && lab1_PT<45000 && lab0_LOKI_PHI>-10 && lab0_LOKI_PHI<10 && lab0_LOKI_ETA>1.5 && lab0_LOKI_ETA<10 && lab0_P>0 && lab0_P<3000000 && lab0_PT>0 && lab0_PT<100000 && (lab0_Hlt2Topo2BodyBBDTDecision_TOS!=0 || lab0_Hlt2Topo3BodyBBDTDecision_TOS!=0 || lab0_Hlt2Topo4BodyBBDTDecision_TOS!=0)"}
-
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/config_Bu2D0Pi.txt b/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/config_Bu2D0Pi.txt
deleted file mode 100644
index d58587870063b0f53b5e7d87719d56973d606112..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bd2DPi_3fbCPV/Bu2D0Pi/config_Bu2D0Pi.txt
+++ /dev/null
@@ -1,229 +0,0 @@
-#Bu2D0Pi KPi 2011 Bu2D0PiHypo
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingData/
-Data2011_Bu2D0Pi_Bu2D0PiHypo_magDown_S21_afterSelection.root
-Data2011_Bu2D0Pi_Bu2D0PiHypo_magUp_S21_afterSelection.root
-Bu2Dpi
-Bu2Dpi
-
-#Bu2D0Pi KPi 2011 Bu2D0KHypo
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingData/
-Data2011_Bu2D0Pi_Bu2D0KHypo_magDown_S21_afterSelection.root
-Data2011_Bu2D0Pi_Bu2D0KHypo_magUp_S21_afterSelection.root
-Bu2DK
-Bu2DK
-
-#Bu2D0Pi KPi 2012 Bu2D0PiHypo
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingData/
-Data2012_Bu2D0Pi_Bu2D0PiHypo_magDown_S21_afterSelection.root
-Data2012_Bu2D0Pi_Bu2D0PiHypo_magUp_S21_afterSelection.root
-Bu2Dpi
-Bu2Dpi
-
-#Bu2D0Pi KPi 2012 Bu2D0KHypo
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingData/
-Data2012_Bu2D0Pi_Bu2D0KHypo_magDown_S21_afterSelection.root
-Data2012_Bu2D0Pi_Bu2D0KHypo_magUp_S21_afterSelection.root
-Bu2DK
-Bu2DK
-
-#Signal Bu2D0Pi KPi 2011 Bu2D0PiHypo
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/
-MC_Bu2D0PiFiltered_2011_PiandKHypo_magDown_S21_afterSelection_OSCombined_PID-corrected_new.root
-MC_Bu2D0PiFiltered_2011_PiandKHypo_magUp_S21_afterSelection_OSCombined_PID-corrected_new.root
-DecayTree
-DecayTree
-###
-
-#Signal Bu2D0Pi KPi 2012 Bu2D0PiHypo
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/
-MC_Bu2D0PiFiltered_2012_PiandKHypo_magDown_S21_afterSelection_OSCombined_PID-corrected_new.root
-MC_Bu2D0PiFiltered_2011_PiandKHypo_magUp_S21_afterSelection_OSCombined_PID-corrected_new.root
-DecayTree
-DecayTree
-###
-
-#Signal Bu2D0Pi KPi 2011 Bu2D0KHypo
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/
-MC_Bu2D0Pi_Bu2D0KHypo_magDown_S21_afterSelection_PID-corrected_new.root
-MC_Bu2D0Pi_Bu2D0KHypo_magUp_S21_afterSelection_PID-corrected_new.root
-Bu2DK
-Bu2DK
-###
-
-#Signal Bu2D0Pi KPi 2012 Bu2D0KHypo
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/
-MC_Bu2D0Pi_Bu2D0KHypo_magDown_S21_afterSelection_PID-corrected_new.root
-MC_Bu2D0Pi_Bu2D0KHypo_magUp_S21_afterSelection_PID-corrected_new.root
-Bu2DK
-Bu2DK
-###
-
-#MC FileName KPi MD 2011 Bu2D0PiHypo
-{"Mode":"Bu2D0K",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bu2D0K_Bu2D0PiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bd2DstPi_Bu2D0PiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-{"Mode":"Bd2D0PiPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bd2D0PiPi_Bu2D0PiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-{"Mode":"Bu2Dst0Pi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bu2Dst0Pi_Bu2D0PiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-{"Mode":"Bs2D0KPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bs2D0KPi_Bu2D0PiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Lb2LcPi_Bu2D0PiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-###
-
-#MC FileName KPi MU 2011 Bu2D0PiHypo
-{"Mode":"Bu2D0K",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bu2D0K_Bu2D0PiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bd2DstPi_Bu2D0PiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-{"Mode":"Bd2D0PiPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bd2D0PiPi_Bu2D0PiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-{"Mode":"Bu2Dst0Pi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bu2Dst0Pi_Bu2D0PiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-{"Mode":"Bs2D0KPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bs2D0KPi_Bu2D0PiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Lb2LcPi_Bu2D0PiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-###
-
-#MC FileName KPi MD 2012 Bu2D0PiHypo
-{"Mode":"Bu2D0K",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bu2D0K_Bu2D0PiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bd2DstPi_Bu2D0PiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-{"Mode":"Bd2D0PiPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bd2D0PiPi_Bu2D0PiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-{"Mode":"Bu2Dst0Pi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bu2Dst0Pi_Bu2D0PiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-{"Mode":"Bs2D0KPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bs2D0KPi_Bu2D0PiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Lb2LcPi_Bu2D0PiHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-###
-
-#MC FileName KPi MU 2012 Bu2D0PiHypo
-{"Mode":"Bu2D0K",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bu2D0K_Bu2D0PiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bd2DstPi_Bu2D0PiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-{"Mode":"Bd2D0PiPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bd2D0PiPi_Bu2D0PiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-{"Mode":"Bu2Dst0Pi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bu2Dst0Pi_Bu2D0PiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-{"Mode":"Bs2D0KPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bs2D0KPi_Bu2D0PiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Lb2LcPi_Bu2D0PiHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2Dpi"}
-###
-
-#MC FileName KPi MD 2011 Bu2D0KHypo
-{"Mode":"Bu2D0K",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bu2D0K_Bu2D0KHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bd2DstPi_Bu2D0KHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-{"Mode":"Bd2D0PiPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bd2D0PiPi_Bu2D0KHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-{"Mode":"Bu2Dst0Pi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bu2Dst0Pi_Bu2D0KHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-{"Mode":"Bs2D0KPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bs2D0KPi_Bu2D0KHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Lb2LcPi_Bu2D0KHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-###
-
-#MC FileName KPi MU 2011 Bu2D0KHypo
-{"Mode":"Bu2D0K",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bu2D0K_Bu2D0KHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bd2DstPi_Bu2D0KHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-{"Mode":"Bd2D0PiPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bd2D0PiPi_Bu2D0KHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-{"Mode":"Bu2Dst0Pi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bu2Dst0Pi_Bu2D0KHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-{"Mode":"Bs2D0KPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bs2D0KPi_Bu2D0KHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Lb2LcPi_Bu2D0KHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-###
-
-#MC FileName KPi MD 2012 Bu2D0KHypo
-{"Mode":"Bu2D0K",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bu2D0K_Bu2D0KHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bd2DstPi_Bu2D0KHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-{"Mode":"Bd2D0PiPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bd2D0PiPi_Bu2D0KHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-{"Mode":"Bu2Dst0Pi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bu2Dst0Pi_Bu2D0KHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-{"Mode":"Bs2D0KPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bs2D0KPi_Bu2D0KHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Lb2LcPi_Bu2D0KHypo_magDown_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-###
-
-#MC FileName KPi MU 2012 Bu2D0KHypo
-{"Mode":"Bu2D0K",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bu2D0K_Bu2D0KHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bd2DstPi_Bu2D0KHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-{"Mode":"Bd2D0PiPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bd2D0PiPi_Bu2D0KHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-{"Mode":"Bu2Dst0Pi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bu2Dst0Pi_Bu2D0KHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-{"Mode":"Bs2D0KPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Bs2D0KPi_Bu2D0KHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DPi_3fb/flavourtaggingMC/MC_Lb2LcPi_Bu2D0KHypo_magUp_S21_afterSelection_PID-corrected_new.root",
- "TreeName":"Bu2DK"}
-###
-
-
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bd2DPi/B2DPiConfigForNominalMassFit.py b/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bd2DPi/B2DPiConfigForNominalMassFit.py
deleted file mode 100644
index 506f47776676dadca75a8d4ae5c60aa696418c62..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bd2DPi/B2DPiConfigForNominalMassFit.py
+++ /dev/null
@@ -1,278 +0,0 @@
-
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    configdict["BDPi_D_BDTGA_sigma1"]  = [9.9782e+00] #[6.0109]
-    configdict["BDPi_D_BDTGA_sigma2"]  = [5.6272e+00] #[11.710]
-    configdict["BDPi_D_BDTGA_n1"]      = [1.5406e+00] #[0.3688]
-    configdict["BDPi_D_BDTGA_n2"]      = [6.3657e-01] #[1.0265]
-    configdict["BDPi_D_BDTGA_alpha1"]  = [1.7496e+00] #[2.5717]
-    configdict["BDPi_D_BDTGA_alpha2"]  = [-2.9946e+00] #[-2.3337]
-    configdict["BDPi_D_BDTGA_frac"]    = [4.0597e-01] #[0.71173]
-
-    configdict["BDPi_D_BDTGA_sigma1_nopid"]  = [9.7880e+00] #[6.0109]                                                                    
-    configdict["BDPi_D_BDTGA_sigma2_nopid"]  = [5.5777e+00] #[11.710]                                                                       
-    configdict["BDPi_D_BDTGA_n1_nopid"]      = [1.5555e+00] #[0.3688]                                                         
-    configdict["BDPi_D_BDTGA_n2_nopid"]      = [8.6615e-01] #[1.0265]                                                                 
-    configdict["BDPi_D_BDTGA_alpha1_nopid"]  = [1.7662e+00] #[2.5717]                                                                     
-    configdict["BDPi_D_BDTGA_alpha2_nopid"]  = [-2.7740e+00] #[-2.3337]                                                         
-    configdict["BDPi_D_BDTGA_frac_nopid"]    = [4.3756e-01] #[0.71173]                   
-
-    configdict["BDPi_D_BDTGC_sigma1"]  = [5.9603]
-    configdict["BDPi_D_BDTGC_sigma2"]  = [11.173]
-    configdict["BDPi_D_BDTGC_n1"]      = [0.40491]
-    configdict["BDPi_D_BDTGC_n2"]      = [1.9933]
-    configdict["BDPi_D_BDTGC_alpha1"]  = [2.5190]
-    configdict["BDPi_D_BDTGC_alpha2"]  = [-2.1635]
-    configdict["BDPi_D_BDTGC_frac"]    = [0.6900]
-
-    configdict["BDPi_D_BDTG1_sigma1"]  = [6.4114]
-    configdict["BDPi_D_BDTG1_sigma2"]  = [16.149]
-    configdict["BDPi_D_BDTG1_n1"]      = [0.38134]
-    configdict["BDPi_D_BDTG1_n2"]      = [63.803]
-    configdict["BDPi_D_BDTG1_alpha1"]  = [2.6933]
-    configdict["BDPi_D_BDTG1_alpha2"]  = [-1.4621]
-    configdict["BDPi_D_BDTG1_frac"]    = [0.76487]
-    
-    configdict["BDPi_D_BDTG2_sigma1"]  = [6.0938]
-    configdict["BDPi_D_BDTG2_sigma2"]  = [12.387]
-    configdict["BDPi_D_BDTG2_n1"]      = [0.96396]
-    configdict["BDPi_D_BDTG2_n2"]      = [0.00022]
-    configdict["BDPi_D_BDTG2_alpha1"]  = [2.2139]
-    configdict["BDPi_D_BDTG2_alpha2"]  = [-2.7515]
-    configdict["BDPi_D_BDTG2_frac"]    = [0.72605]
-                            
-    configdict["BDPi_D_BDTG3_sigma1"]  = [6.6574]
-    configdict["BDPi_D_BDTG3_sigma2"]  = [6.3242]
-    configdict["BDPi_D_BDTG3_n1"]      = [6.1752]
-    configdict["BDPi_D_BDTG3_n2"]      = [24.887]
-    configdict["BDPi_D_BDTG3_alpha1"]  = [0.94966]
-    configdict["BDPi_D_BDTG3_alpha2"]  = [-1.2567]
-    configdict["BDPi_D_BDTG3_frac"]    = [0.37238]
-
-    ################################################
-
-    configdict["BDPi_B_BDTGA_sigma1"]  = [8.5977e+00] #[14.673]
-    configdict["BDPi_B_BDTGA_sigma2"]  = [1.4543e+01] #[5.5420]
-    configdict["BDPi_B_BDTGA_n1"]      = [1.7650e+00] #[1.4094]
-    configdict["BDPi_B_BDTGA_n2"]      = [5.4072e+00] #[5.0423]
-    configdict["BDPi_B_BDTGA_alpha1"]  = [9.1142e-01] #[1.9154]
-    configdict["BDPi_B_BDTGA_alpha2"]  = [-2.0650e+00] #[-0.49187]
-    configdict["BDPi_B_BDTGA_frac"]    = [2.5354e-01] #[0.87419]
-    
-    configdict["BDPi_B_BDTGA_sigma1_nopid"]  = [2.7504e+01] #[6.0109]                                                              
-    configdict["BDPi_B_BDTGA_sigma2_nopid"]  = [1.3146e+01] #[11.710]                                                                       
-    configdict["BDPi_B_BDTGA_n1_nopid"]      = [2.2966e+00] #[0.3688]                                                                            
-    configdict["BDPi_B_BDTGA_n2_nopid"]      = [1.8046e+01] #[1.0265]                                                                             
-    configdict["BDPi_B_BDTGA_alpha1_nopid"]  = [1.0165e+00] #[2.5717]                                                                  
-    configdict["BDPi_B_BDTGA_alpha2_nopid"]  = [-4.8090e+00] #[-2.3337]                                                              
-    configdict["BDPi_B_BDTGA_frac_nopid"]    = [1.7359e-01] #[0.71173]                                
-
-    configdict["BDPi_B_BDTGC_sigma1"]  = [11.584]
-    configdict["BDPi_B_BDTGC_sigma2"]  = [17.875]
-    configdict["BDPi_B_BDTGC_n1"]      = [1.2648]
-    configdict["BDPi_B_BDTGC_n2"]      = [2.5928]
-    configdict["BDPi_B_BDTGC_alpha1"]  = [1.7760]
-    configdict["BDPi_B_BDTGC_alpha2"]  = [-2.1635]
-    configdict["BDPi_B_BDTGC_frac"]    = [0.57768]
-    
-    configdict["BDPi_B_BDTG1_sigma1"]  = [17.859]
-    configdict["BDPi_B_BDTG1_sigma2"]  = [11.855]
-    configdict["BDPi_B_BDTG1_n1"]      = [1.1113]
-    configdict["BDPi_B_BDTG1_n2"]      = [2.1416]
-    configdict["BDPi_B_BDTG1_alpha1"]  = [1.6260]
-    configdict["BDPi_B_BDTG1_alpha2"]  = [-1.8632]
-    configdict["BDPi_B_BDTG1_frac"]    = [0.45229]
-    
-    configdict["BDPi_B_BDTG2_sigma1"]  = [11.112]
-    configdict["BDPi_B_BDTG2_sigma2"]  = [17.367]
-    configdict["BDPi_B_BDTG2_n1"]      = [1.2075]
-    configdict["BDPi_B_BDTG2_n2"]      = [2.3282]
-    configdict["BDPi_B_BDTG2_alpha1"]  = [1.6733]
-    configdict["BDPi_B_BDTG2_alpha2"]  = [-2.2144]
-    configdict["BDPi_B_BDTG2_frac"]    = [0.48100]
-    
-    configdict["BDPi_B_BDTG3_sigma1"]  = [12.229]
-    configdict["BDPi_B_BDTG3_sigma2"]  = [19.994]
-    configdict["BDPi_B_BDTG3_n1"]      = [1.3458]
-    configdict["BDPi_B_BDTG3_n2"]      = [2.3741]
-    configdict["BDPi_B_BDTG3_alpha1"]  = [1.9349]
-    configdict["BDPi_B_BDTG3_alpha2"]  = [-2.3558]
-    configdict["BDPi_B_BDTG3_frac"]    = [0.72748]
-
-    ################################################
-
-    configdict["BDPi_D_BDTGA_slope"]  = [-1.6707e-03]
-    configdict["BDPi_D_BDTGC_slope"]  = [-1.4560e-03]
-    configdict["BDPi_D_BDTG1_slope"]  = [-1.6397e-03]
-    configdict["BDPi_D_BDTG2_slope"]  = [-1.5883e-03]
-    configdict["BDPi_D_BDTG3_slope"]  = [-1.5883e-03]
-    
-    ################################################
-
-    configdict["BDPi_B_BDTGA_slope1"]  = [-9.4861e-04] #[-9.9277e-04]
-    configdict["BDPi_B_BDTGC_slope1"]  = [-3.0000e-03] #[-9.4644e-04] #[-1.0000e-03]
-    configdict["BDPi_B_BDTG1_slope1"]  = [-1.6111e-02] #[-8.0558e-03]
-    configdict["BDPi_B_BDTG2_slope1"]  = [-2.9979e-03] #[-1.0209e-03]
-    configdict["BDPi_B_BDTG3_slope1"]  = [-4.6422e-03] #[-7.0689e-04]
-
-    ################################################
-
-    configdict["BDPi_B_BDTGA_slope2"]  = [-4.6334e-03] #[-8.7344e-03]
-    configdict["BDPi_B_BDTGC_slope2"]  = [-4.4580e-10] #[-5.1571e-03] #[-9.0343e-03]
-    configdict["BDPi_B_BDTG1_slope2"]  = [-1.2051e-03] #[-9.8204e-04]
-    configdict["BDPi_B_BDTG2_slope2"]  = [-1.6648e-03] #[-8.1089e-03]
-    configdict["BDPi_B_BDTG3_slope2"]  = [-2.3211e-03] #[-1.4318e-02]
-
-     ################################################
-
-    configdict["BDPi_B_BDTGA_fracComb"]  = [7.1416e-01] #[8.7293e-01]
-    configdict["BDPi_B_BDTGC_fracComb"]  = [8.0431e-01] #[5.9937e-01] #[8.0879e-01]
-    configdict["BDPi_B_BDTG1_fracComb"]  = [1.5500e-06] #[9.6999e-02]
-    configdict["BDPi_B_BDTG2_fracComb"]  = [1.5055e-02] #[7.3716e-01]
-    configdict["BDPi_B_BDTG3_fracComb"]  = [1.0] #[2.7055e-01]
-                        
-    
-    ################################################
-
-    configdict["BDPi_D_BDTGA_fracComb"]  = [8.3957e-01]
-    configdict["BDPi_D_BDTGC_fracComb"]  = [8.6519e-01]
-    configdict["BDPi_D_BDTG1_fracComb"]  = [8.2367e-01]
-    configdict["BDPi_D_BDTG2_fracComb"]  = [8.7215e-01]
-    configdict["BDPi_D_BDTG3_fracComb"]  = [8.7215e-01]
-                        
-                     
-    ################################################
-
-    configdict["BDPi_D_BDTGA_sigma1_bc"]  = [12.818]
-    configdict["BDPi_D_BDTGA_sigma2_bc"]  = [6.1793]
-    configdict["BDPi_D_BDTGA_n1_bc"]      = [69.999]
-    configdict["BDPi_D_BDTGA_n2_bc"]      = [44.783]
-    configdict["BDPi_D_BDTGA_alpha1_bc"]  = [1.1198]
-    configdict["BDPi_D_BDTGA_alpha2_bc"]  = [-4.7163]
-    configdict["BDPi_D_BDTGA_frac_bc"]    = [0.22342]
-
-    configdict["BDPi_D_BDTGC_sigma1_bc"]  = [11.906]
-    configdict["BDPi_D_BDTGC_sigma2_bc"]  = [6.2074]
-    configdict["BDPi_D_BDTGC_n1_bc"]      = [69.866]
-    configdict["BDPi_D_BDTGC_n2_bc"]      = [53.017]
-    configdict["BDPi_D_BDTGC_alpha1_bc"]  = [1.1251]
-    configdict["BDPi_D_BDTGC_alpha2_bc"]  = [-4.9262]
-    configdict["BDPi_D_BDTGC_frac_bc"]    = [0.21623]
-    
-    configdict["BDPi_D_BDTG1_sigma1_bc"]  = [6.0807]
-    configdict["BDPi_D_BDTG1_sigma2_bc"]  = [6.3940]
-    configdict["BDPi_D_BDTG1_n1_bc"]      = [69.988]
-    configdict["BDPi_D_BDTG1_n2_bc"]      = [69.998]
-    configdict["BDPi_D_BDTG1_alpha1_bc"]  = [0.50138]
-    configdict["BDPi_D_BDTG1_alpha2_bc"]  = [-1.0893]
-    configdict["BDPi_D_BDTG1_frac_bc"]    = [0.26044]
-    
-    configdict["BDPi_D_BDTG2_sigma1_bc"]  = [13.599]
-    configdict["BDPi_D_BDTG2_sigma2_bc"]  = [6.2726]
-    configdict["BDPi_D_BDTG2_n1_bc"]      = [69.998]
-    configdict["BDPi_D_BDTG2_n2_bc"]      = [10.205]
-    configdict["BDPi_D_BDTG2_alpha1_bc"]  = [1.1926]
-    configdict["BDPi_D_BDTG2_alpha2_bc"]  = [-6.7549]
-    configdict["BDPi_D_BDTG2_frac_bc"]    = [0.22381]
-
-    configdict["BDPi_D_BDTG3_sigma1_bc"]  = [12.004]
-    configdict["BDPi_D_BDTG3_sigma2_bc"]  = [6.1265]
-    configdict["BDPi_D_BDTG3_n1_bc"]      = [69.993]
-    configdict["BDPi_D_BDTG3_n2_bc"]      = [67.581]
-    configdict["BDPi_D_BDTG3_alpha1_bc"]  = [1.0924]
-    configdict["BDPi_D_BDTG3_alpha2_bc"]  = [-4.7004]
-    configdict["BDPi_D_BDTG3_frac_bc"]    = [0.21078]
-    
-    ################################################
-                         
-    configdict["BDPi_B_BDTGA_sigma1_bc"]  = [1.1570e+01]
-    configdict["BDPi_B_BDTGA_sigma2_bc"]  = [1.7757e+01]
-    configdict["BDPi_B_BDTGA_n1_bc"]      = [1.2332e+00]
-    configdict["BDPi_B_BDTGA_n2_bc"]      = [5.9538e+00]
-    configdict["BDPi_B_BDTGA_alpha1_bc"]  = [1.8612e+00]
-    configdict["BDPi_B_BDTGA_alpha2_bc"]  = [-2.1143e+00]
-    configdict["BDPi_B_BDTGA_frac_bc"]    = [5.8739e-01]
-
-    configdict["BDPi_B_BDTGC_sigma1_bc"]  = [11.527]
-    configdict["BDPi_B_BDTGC_sigma2_bc"]  = [17.684]
-    configdict["BDPi_B_BDTGC_n1_bc"]      = [1.2444]
-    configdict["BDPi_B_BDTGC_n2_bc"]      = [5.6489]
-    configdict["BDPi_B_BDTGC_alpha1_bc"]  = [1.8454]
-    configdict["BDPi_B_BDTGC_alpha2_bc"]  = [-2.1261]
-    configdict["BDPi_B_BDTGC_frac_bc"]    = [0.58240]
-    
-    configdict["BDPi_B_BDTG1_sigma1_bc"]  = [21.665]
-    configdict["BDPi_B_BDTG1_sigma2_bc"]  = [11.787]
-    configdict["BDPi_B_BDTG1_n1_bc"]      = [1.2463]
-    configdict["BDPi_B_BDTG1_n2_bc"]      = [0.0049]
-    configdict["BDPi_B_BDTG1_alpha1_bc"]  = [1.6421]
-    configdict["BDPi_B_BDTG1_alpha2_bc"]  = [-5.7518]
-    configdict["BDPi_B_BDTG1_frac_bc"]    = [0.34003]
-
-    configdict["BDPi_B_BDTG2_sigma1_bc"]  = [11.155]
-    configdict["BDPi_B_BDTG2_sigma2_bc"]  = [17.518]
-    configdict["BDPi_B_BDTG2_n1_bc"]      = [1.1759]
-    configdict["BDPi_B_BDTG2_n2_bc"]      = [3.5088]
-    configdict["BDPi_B_BDTG2_alpha1_bc"]  = [1.7850]
-    configdict["BDPi_B_BDTG2_alpha2_bc"]  = [-2.2694]
-    configdict["BDPi_B_BDTG2_frac_bc"]    = [0.50796]
-    
-    configdict["BDPi_B_BDTG3_sigma1_bc"]  = [12.198]
-    configdict["BDPi_B_BDTG3_sigma2_bc"]  = [19.176]
-    configdict["BDPi_B_BDTG3_n1_bc"]      = [1.2883]
-    configdict["BDPi_B_BDTG3_n2_bc"]      = [7.6431]
-    configdict["BDPi_B_BDTG3_alpha1_bc"]  = [1.9855]
-    configdict["BDPi_B_BDTG3_alpha2_bc"]  = [-2.1288]
-    configdict["BDPi_B_BDTG3_frac_bc"]    = [0.72201]
-    
-    ################################################
-
-    configdict["pred_Signal_BDTGA"]  = [7.6424e+04] #50759.1, 72612.0 ]
-    configdict["pred_Signal_BDTG1"]  = [1.5058e+04] #7535.40, 11114.0 ]
-    configdict["pred_Signal_BDTG2"]  = [2.9567e+04] #16994.0, 24484.0 ]
-    configdict["pred_Signal_BDTG3"]  = [3.2828e+04]  #22784.0, 32338.0 ]
-    configdict["pred_Signal_BDTGC"]  = [7.2251e+04] #[7.1847e+04]  #44781.0, 64314.0 ]
-    
-    configdict["pred_BDK_BDTGA"]  = 1825 #8.9742e+03  #2282.0 #867.0 #137.0
-    configdict["pred_BDK_BDTGC"]  = 1723 #2147.0*0.65 #1.1117e+04 #8.3639e+03   #2147.0 #820.0 #130.0
-    configdict["pred_BDK_BDTG1"]  = 322  #420.0*0.65 #2.2098e+03   #420.0 #153.0 #24.0
-    configdict["pred_BDK_BDTG2"]  = 686  #867.0*0.65 #3.8441e+03   #867.0 #52.0
-    configdict["pred_BDK_BDTG3"]  = 824  #391.0*0.65 #3.3455e+03   #1003.0 # 391.0 #63.0
-    
-    configdict["pred_BsDsPi_BDTG1"]  = [2.4826e+02]
-    configdict["pred_BsDsPi_BDTG2"]  = [1.9868e+03]
-    configdict["pred_BsDsPi_BDTG3"]  = [1.2095e+03]
-    configdict["pred_BsDsPi_BDTGA"]  = [4.2436e+03]
-    configdict["pred_BsDsPi_BDTGC"]  = [6.5538e+03] #[3.9347e+03]
-    
-    configdict["pred_LbLcPi_BDTG1"]  = [1.0806e+03]
-    configdict["pred_LbLcPi_BDTG2"]  = [1.8438e+03]
-    configdict["pred_LbLcPi_BDTG3"]  = [1.7210e+03]
-    configdict["pred_LbLcPi_BDTGA"]  = [4.4624e+03]
-    configdict["pred_LbLcPi_BDTGC"]  = [6.5283e+03] # [4.1374e+03]
-
-    configdict["pred_BDRho_BDTG1"]  = [7.6560e+03]
-    configdict["pred_BDRho_BDTG2"]  = [1.6675e+04]
-    configdict["pred_BDRho_BDTG3"]  = [1.2957e+04]
-    configdict["pred_BDRho_BDTGA"]  = [4.2518e+04]
-    configdict["pred_BDRho_BDTGC"]  = [4.5996e+04] #[3.9052e+04]
-    
-    configdict["pred_BDstPi_BDTG1"]  = [6.7107e+03]
-    configdict["pred_BDstPi_BDTG2"]  = [1.0622e+04]
-    configdict["pred_BDstPi_BDTG3"]  = [8.8481e+03]
-    configdict["pred_BDstPi_BDTGA"]  = [1.9336e+04]
-    configdict["pred_BDstPi_BDTGC"]  = [1.5920e+04] #[1.8307e+04]
-
-    configdict["pred_Comb_BDTG1"]  = [1.5058e+04]
-    configdict["pred_Comb_BDTG2"]  = [2.9243e+03]
-    configdict["pred_Comb_BDTG3"]  = [4.8894e+02]
-    configdict["pred_Comb_BDTGA"]  = [2.0933e+04]
-    configdict["pred_Comb_BDTGC"]  = [2.0566e+04] #[1.1412e+04]
-    
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForBs2DsKst.py b/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForBs2DsKst.py
deleted file mode 100644
index aa988a20769edcd738cc1541a92f9cb451e0f242..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForBs2DsKst.py
+++ /dev/null
@@ -1,183 +0,0 @@
-from __future__ import division
-from past.utils import old_div
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # PHYSICAL PARAMETERS
-    configdict["BMass"]      = [5100,    5800   ]
-    configdict["DMass"]      = [1910,    2030   ]
-    configdict["Time"]       = [0.2,     15.0    ]
-    configdict["Momentum"]   = [3000.0,  650000.0]
-    configdict["TrMom"]      = [400.0,   45000.0 ]
-    configdict["PIDK"]       = [1.61,    5.0     ]
-    configdict["nTracks"]    = [15.0,    1000.0  ]
-    configdict["BDTG"]	     = [-0.97,	100]	
-
-    configdict["TagDec"]     = ["Bs_BsTaggingTool_TAGDECISION_OS","Bs_BsTaggingTool_SS_nnetKaon_DEC"]
-    configdict["Bs_BsTaggingTool_TAGDECISION_OS"]  = [-1.0, 1.0]
-    configdict["Bs_BsTaggingTool_SS_nnetKaon_DEC"] = [-1.0, 1.0]
-
-    configdict["TagOmega"]   = ["Bs_BsTaggingTool_TAGOMEGA_OS","Bs_BsTaggingTool_SS_nnetKaon_PROB"]
-    configdict["Bs_BsTaggingTool_TAGOMEGA_OS"]  = [0.0, 0.5]
-    configdict["Bs_BsTaggingTool_SS_nnetKaon_PROB"] = [0.0, 0.5]
-
-    configdict["calibration_p0"]  = [0.3927, 0.4244]
-    configdict["calibration_p1"]  = [0.9818, 1.2550]
-    configdict["calibration_av"]  = [0.3919, 0.4097]
-                                               
-    configdict["Terr"]       = [0.01,    0.1     ]
-    configdict["BachCharge"] = [-1000.0, 1000.0  ]
-
-    configdict["labX"] = 0
-    configdict["AdditionalDataCuts"] = "Pi0_PT>800&&Ds_FD_ORIVX>0&&Ds_FDCHI2_ORIVX>2&&Km_PIDK>5&&Kp_PIDK>5&&Pi_PIDK<0&&Bac_PIDK>5&&Ds_TAU>0"
-    configdict["AdditionalMCCuts"] = "Pi0_PT>800&&Ds_FD_ORIVX>0&&Ds_FDCHI2_ORIVX>2&&Ds_TAU>0"
-            
-    configdict["Bin1"]       = 20
-    configdict["Bin2"]       = 20
-    configdict["Bin3"]       = 10
-    configdict["Var1"]       = "Bac_PT"
-    configdict["Var2"]       = "nTracks"
-    configdict["Var3"]       = "Bac_P"
-    configdict["WeightingDimensions"] = 2
-    
-    configdict["PIDBach"]    = 5
-    configdict["PIDChild"]   = 0
-    configdict["PIDProton"]  = 5    
-    configdict["dataName"]   = "../data/config_Bs2DsK_for_Bs2DsKst.txt"
-
-    configdict["fileCalibPionUp"]  = "/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID5_Str20.root"
-    configdict["fileCalibPionDown"]  = "/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID5_Str20.root"
-    configdict["fileCalibKaonUp"]  = "/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID5_Str20.root"
-    configdict["fileCalibKaonDown"]  = "/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID5_Str20.root"
-    configdict["workCalibPion"]  = "RSDStCalib"
-    configdict["workCalibKaon"]  = "RSDStCalib"
-
-    configdict["fileCalibProtonUp"]  = "/afs/cern.ch/work/a/adudziak/public/workspace/work_lblcpi_up_sw.root"
-    configdict["fileCalibProtonDown"]  = "/afs/cern.ch/work/a/adudziak/public/workspace/work_lblcpi_down_sw.root"
-    configdict["workCalibProton"]  = "workspace"
-    configdict["pathFileLcPi"]  = "/afs/cern.ch/work/a/adudziak/public/workspace/sWeights_LbLcPi_both_PID10.root"
-    configdict["treeNameLcPi"] = "merged"    
-
-    configdict["lumRatioDown"] =  0.5
-    configdict["lumRatioUp"] =  0.5
-    configdict["lumRatio"] =  old_div(configdict["lumRatioUp"],(configdict["lumRatioDown"]+configdict["lumRatioUp"]))
-    
-    # 1: NonRes, 2: PhiPi, 3: KstK, 4: KPiPi, 5: PiPiPi 
-    configdict["mean"]    = [5367.51, 5367.51, 5367.51, 5367.51, 5367.51]
-
-    # Bs signal shale without BKGCAT
-    #configdict["sigma1"]  = [14.240,  18.107,  12.092,  11.88,   12.504 ] #*1.252
-    #configdict["sigma2"]  = [9.0773,  11.925,  16.078,  18.539,  20.000 ] #*1.777
-    #configdict["alpha1"]  = [1.8539,  1.6328,  1.7344,  1.9468,  1.8922 ] #*1.004 
-    #configdict["alpha2"]  = [-1.3223, -2.3348, -1.9130, -2.1141, -2.1200] #*0.832
-    #configdict["n1"]      = [1.2508,  1.4973,  1.2819,  1.0945,  1.2074 ] 
-    #configdict["n2"]      = [1.7330,  1.8582,  4.0326,  2.8556,  2.6656 ]
-    #configdict["frac"]    = [0.85102, 0.46495, 0.51567, 0.65731, 0.68870]
-
-    #Bs signal shape with BKGCAT
-    #configdict["sigma1_bc"]  = [20.0] 
-    #configdict["sigma2_bc"]  = [10.0] 
-    #configdict["alpha1_bc"]  = [1.8106] 
-    #configdict["alpha2_bc"]  = [-0.6209] 
-    #configdict["n1_bc"]      = [0.95322]
-    #configdict["n2_bc"]      = [2.6109]
-    #configdict["frac_bc"]    = [0.579]
-
-    #BDT
-
-    configdict["sigma1_bc"]  = [14.998] 
-    configdict["sigma2_bc"]  = [25.669] 
-    configdict["alpha1_bc"]  = [1.6930] 
-    configdict["alpha2_bc"]  = [-1.7181] 
-    configdict["n1_bc"]      = [1.3198]
-    configdict["n2_bc"]      = [1.8442]
-    configdict["frac_bc"]    = [0.57637]
-
-
-    #BDT+VETO
-
-    #configdict["sigma1_bc"]  = [14.707] 
-    #configdict["sigma2_bc"]  = [20.459] 
-    #configdict["alpha1_bc"]  = [1.2683] 
-    #configdict["alpha2_bc"]  = [-2.3801] 
-    #configdict["n1_bc"]      = [1.9393]
-    #configdict["n2_bc"]      = [1.1800]
-    #configdict["frac_bc"]    = [0.57619]
-
-    # ratio data/MC
-    configdict["sigma1Bsfrac"] = 1.145 
-    configdict["sigma2Bsfrac"] = 1.255
-    configdict["alpha1Bsfrac"] = 1.0 
-    configdict["alpha2Bsfrac"] = 1.0 
-
-    configdict["ratio1"]  = 1.00808721452
-    configdict["ratio2"]  = 1.0386867331        
-
-    configdict["meanDs"]    = [1968.49, 1968.49, 1968.49, 1968.49, 1968.49 ]
-
-    #Ds signal shapes without BKGCAT
-    #configdict["sigma1Ds"]  = [4.8865,   5.0649,  5.4377,  5.8510,  5.5906 ] #*1.167
-    #configdict["sigma2Ds"]  = [5.0645,   5.5344,  5.3877,  10.180,  10.073 ] #*1.096 
-    #configdict["alpha1Ds"]  = [0.51973,  1.1934,  0.7734,  2.8195,  1.9343 ] #*1.140
-    #configdict["alpha2Ds"]  = [-0.9908,  -1.1806, -1.1424, -2.2422,  -1.7027] #*1.022
-    #configdict["n1Ds"]      = [50.000,   4.0702,  49.999,  0.0262,  0.2633 ]
-    #configdict["n2Ds"]      = [50.000,   10.643,  50.000,  1.9293,  8.6233 ]
-    #configdict["fracDs"]    = [0.25406,  0.48465, 0.32864, 0.59958, 0.27873]
-
-    #Ds signal shapes with BKGCAT
-    #configdict["sigma1Ds_bc"]  = [27.81]
-    #BDT
-    configdict["sigma1Ds_bc"]  = [1.8718e+01] #26.286]
-    #BDT+VETO
-    #configdict["sigma1Ds_bc"]  = [24.446]
-    configdict["sigma2Ds_bc"]  = [4.9472e+01] 
-    configdict["alpha1Ds_bc"]  = [] 
-    configdict["alpha2Ds_bc"]  = []
-    configdict["n1Ds_bc"]      = []
-    configdict["n2Ds_bc"]      = []
-    configdict["fracDs_bc"]    = [5.6148e-01]
-    
-    # ratio data/MC
-    configdict["sigma1Dsfrac"] = 1.074
-    configdict["sigma2Dsfrac"] = 1.185 
-    configdict["alpha1Dsfrac"] = 1.0 
-    configdict["alpha2Dsfrac"] = 1.0 
-        
-
-    # combinatorial background
-    configdict["cB1"]                = [-100.e-03]
-    configdict["cB2"]                = [0.0,      ]
-    configdict["fracBsComb"]         = [4.3067e-01]
-    
-    configdict["cD"]        = [-2.7520e-03] 
-    configdict["fracComb"]  = [1.0]          
-
-    #expected Events
-    configdict["BdDPiEvents"]  = [331.0, 4.0,  81.0, 28.0, 0.0]
-    configdict["LbLcPiEvents"] = [301.0, 30.0, 68.0, 0.0,  0.0] #[312.0, 38.0, 69.0, 17.0,  0.0] #[301.0, 30.0, 68.0, 0.0,  0.0]
-
-
-    configdict["Bd2DKEvents"]=[80.]
-    configdict["Bd2DsKEvents"]=[60.]
-    configdict["Bs2DsstKEvents"]=[50.]
-    configdict["Bd2DsstKEvents"]=[1000.]
-    configdict["LbLcKEvents"]=[300.]
-
-
-    configdict["BsDsKEvents"]  = [42.0,  48.0, 43.0, 8.0,  22.0]
-        
-    configdict["assumedSig"]   = [10146.7, 13952.8,
-                                  10146.7, 13952.8,
-                                  10146.7, 13952.8,
-                                  752., 1195.,
-                                  1730., 2384.] #[9180.,13005.,730.,1160.,1680.,2315.]
-    configdict["nBd2DsPi"]     = 1./25. #1./30.
-    configdict["nBd2DsstPi"]   = 1./25. #1./30.
-    configdict["nBd2DstPi"]    = 1./4.
-    configdict["nBd2DRho"]     = 1./3.5
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForGenerator5M.py b/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForGenerator5M.py
deleted file mode 100644
index c1cf1c223b1b88b0ddb950d791900d94840eeca8..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForGenerator5M.py
+++ /dev/null
@@ -1,223 +0,0 @@
-from __future__ import division
-from past.utils import old_div
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-
-    # FILENAMES
-    configdict["fileName"]           = "/afs/cern.ch/work/g/gligorov/public/Bs2DsKPlotsForPaper/NominalFit/work_dsk_pid_53005800_PIDK5_5M_BDTGA.root"
-    configdict["fileNameData"]       = "/afs/cern.ch/work/g/gligorov/public/Bs2DsKPlotsForPaper/NominalFit/work_dsk_pid_53005800_PIDK5_5M_BDTGA.root"
-    configdict["fileNameTerr"]       = "../data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root"
-    configdict["fileNameMistag"]     = "../data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root"
-    configdict["fileNameMistagBDPi"] = "../data/workspace/MDFitter/template_Data_Mistag_BDPi.root"
-    configdict["fileNameMistagComb"] = "../data/workspace/MDFitter/template_Data_Mistag_CombBkg.root"
-    configdict["fileNameKFactHists"] = "../data/workspace/MDFitter/kFactorsInMassBins/histograms_MC_KFactor_BsDsK.root"
-
-    # EVENTUALLY MUCH OF THE REST OF THIS CONFIG SHOULD BE REWRITTEN
-    # INTO THIS DICTIONARY. FOR NOW PUT THE MC TRUTH AND WHO NEEDS
-    # A K-FACTOR HERE.
-    configdict["DecayModeParameters"] = {}
-    configdict["DecayModeParameters"]["Signal"]     = { "TRUEID" : "1"    , "KFACTOR" : False }
-    configdict["DecayModeParameters"]["Bd2DK"]      = { "TRUEID" : "2"    , "KFACTOR" : True  }
-    configdict["DecayModeParameters"]["Bd2DPi"]     = { "TRUEID" : "12"   , "KFACTOR" : True  }
-    configdict["DecayModeParameters"]["Bd2DsK"]     = { "TRUEID" : "3"    , "KFACTOR" : False }
-    configdict["DecayModeParameters"]["Bs2DsPi"]    = { "TRUEID" : "4"    , "KFACTOR" : True  }
-    configdict["DecayModeParameters"]["Bs2DsstPi"]  = { "TRUEID" : "8"    , "KFACTOR" : True  }
-    configdict["DecayModeParameters"]["Bs2DsRho"]   = { "TRUEID" : "18"   , "KFACTOR" : True  }
-    configdict["DecayModeParameters"]["Lb2LcK"]     = { "TRUEID" : "5"    , "KFACTOR" : True  }
-    configdict["DecayModeParameters"]["Lb2LcPi"]    = { "TRUEID" : "15"   , "KFACTOR" : True  }
-    configdict["DecayModeParameters"]["Lb2Dsp"]     = { "TRUEID" : "6"    , "KFACTOR" : True  }
-    configdict["DecayModeParameters"]["Lb2Dsstp"]   = { "TRUEID" : "16"   , "KFACTOR" : True  }
-    configdict["DecayModeParameters"]["LM1"]        = { "TRUEID" : "7"    , "KFACTOR" : False }
-    configdict["DecayModeParameters"]["Combo"]      = { "TRUEID" : "10"   , "KFACTOR" : False }
- 
-    # PHYSICAL PARAMETERS
-    configdict["kFactorBinning"]= 50    # in MeV
-
-    configdict["Gammas"]        =  0.661   # in ps^{-1}
-    configdict["DeltaGammas"]   = -0.105
-
-    configdict["Gammad"]        =  0.656   # in ps^{-1}
-    configdict["DeltaGammad"]   =  0.
-
-    configdict["DeltaMs"]       =  17.768    # in ps^{-1}
-    configdict["DeltaMd"]       =  0.507   # in ps^{-1}
-
-    configdict["GammaLb"]       =  0.676    # in ps^{-1}
-
-    #order: OS, SSK, OS+SSK, untagged
-    configdict["D_Combo"]            =  [-0.908, -0.775, -0.913, -0.938]
-    configdict["DeltaGammaCombo"]    =  [ 0.845,  1.266,  1.282,  0.753]
-    configdict["GammaCombo"]         =  [ 0.913,  1.451,  1.371,  0.745]
-    configdict["tagEff_Combo_full"]  =  [ [1.0, 0.0, 0.0], 
-                                          [0.0, 1.0, 0.0], 
-                                          [0.0, 0.0, 1.0], 
-                                          [0.0, 0.0, 0.0] ]
-
-    configdict["StrongPhase_d"] = 20. / 180. * pi
-    configdict["StrongPhase_s"] = 4. / 180. * pi
-    configdict["WeakPhase"]     = 116. / 180. * pi
-
-    configdict["ArgLf_d"]       = configdict["StrongPhase_d"] - configdict["WeakPhase"]
-    configdict["ArgLbarfbar_d"] = configdict["StrongPhase_d"] + configdict["WeakPhase"]
-    configdict["ModLf_d"]       = 0.015
-    
-    configdict["ArgLf_s"]       = configdict["StrongPhase_s"] - configdict["WeakPhase"]
-    configdict["ArgLbarfbar_s"] = configdict["StrongPhase_s"] + configdict["WeakPhase"]
-    configdict["ModLf_s"]       = 0.51 #0.372
-
-    configdict["calibration_p0"]  = [0.3927, 0.4244]
-    configdict["calibration_p1"]  = [0.9818, 1.2550]
-    configdict["calibration_av"]  = [0.3919, 0.4097]
-       
-    configdict["resolutionScaleFactor"] = 1.37
-    configdict["resolutionMeanBias"]    = 0.0
-    
-    configdict["nBinsMistag"]   = 50
-    configdict["nBinsProperTimeErr"]   = 50
-    configdict["nBinsAcceptance"]   = 740
-    
-    configdict["lumRatioDown"]  =  0.59
-    configdict["lumRatioUp"]    =  0.44
-    configdict["lumRatio"]      =  old_div(configdict["lumRatioUp"],(configdict["lumRatioDown"]+configdict["lumRatioUp"]))
-    
-    configdict["massRange"]     = [5300,5800] # in MeV 
-    configdict["timeRange"]     = [0.4, 15] # in ps
-
-    configdict["tacc_size"]   = 6
-    configdict["tacc_knots"]  = [0.5, 1.0, 1.5, 2.0, 3.0, 12.0]
-    configdict["tacc_values"] = [0.4453873694523979, 0.6869245867352556, 0.8719680916278891, 1.1614426699209424, 1.2341250036543179, 1.2852701638596233]
-
-    configdict["tagEff_OS"] = 0.387
-    configdict["tagEff_SS"] = 0.4772
-    
-    configdict["tagEff_OS_Bd"] = 0.844757
-    configdict["tagEff_SS_Bd"] = 1.0 
-
-    configdict["tagEff_Bd"] = [configdict["tagEff_OS_Bd"] - configdict["tagEff_OS_Bd"]*configdict["tagEff_SS_Bd"],
-                               configdict["tagEff_SS_Bd"] - configdict["tagEff_OS_Bd"]*configdict["tagEff_SS_Bd"],
-                               configdict["tagEff_OS_Bd"]*configdict["tagEff_SS_Bd"]]
-
-    configdict["tagEff_OS_Lb"] = 0.0
-    configdict["tagEff_SS_Lb"] = 1.0
-
-    configdict["tagEff_Lb"] = [configdict["tagEff_OS_Lb"] - configdict["tagEff_OS_Lb"]*configdict["tagEff_SS_Lb"],
-                               configdict["tagEff_SS_Lb"] - configdict["tagEff_OS_Lb"]*configdict["tagEff_SS_Lb"],
-                               configdict["tagEff_OS_Lb"]*configdict["tagEff_SS_Lb"]]
-    
-    configdict["tagEff_OS_Combo"] = 0.594
-    configdict["tagEff_SS_Combo"] = 0.462
-
-    configdict["tagEff_Signal"]    = [configdict["tagEff_OS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_SS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_OS"]*configdict["tagEff_SS"]]
-    configdict["tagEff_Bd2DK"]     = configdict["tagEff_Signal"]
-    configdict["tagEff_Bd2DPi"]       = configdict["tagEff_Signal"]
-    configdict["tagEff_Bd2DsK"]       = configdict["tagEff_Signal"]
-    configdict["tagEff_Bs2DsPi"]   = configdict["tagEff_Signal"]   
-    configdict["tagEff_Lb2LcK"]       = configdict["tagEff_Signal"]
-    configdict["tagEff_Lb2LcPi"]      = configdict["tagEff_Signal"]
-    configdict["tagEff_Combo"]     = [configdict["tagEff_OS_Combo"] - configdict["tagEff_OS_Combo"]*configdict["tagEff_SS_Combo"],
-                                      configdict["tagEff_SS_Combo"] - configdict["tagEff_OS_Combo"]*configdict["tagEff_SS_Combo"],
-                                      configdict["tagEff_OS_Combo"]*configdict["tagEff_SS_Combo"]]
-    configdict["tagEff_Lb2Dsp"]       = configdict["tagEff_Signal"]
-    configdict["tagEff_Lb2Dsstp"]     = configdict["tagEff_Signal"]    
-    configdict["tagEff_LM1"]       = [configdict["tagEff_OS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_SS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_OS"]*configdict["tagEff_SS"]]
-    configdict["tagEff_Bs2DsstPi"]    = configdict["tagEff_Signal"]
-    configdict["tagEff_Bs2DsRho"]     = configdict["tagEff_Signal"]
-
-    configdict["aprod_Signal"]    = 0.0 #0.03
-    configdict["aprod_Bd2DK"]        = 0.0 #0.03
-    configdict["aprod_Bd2DPi"]       = 0.0 #0.03 
-    configdict["aprod_Bd2DsK"]    = 0.0 #3
-    configdict["aprod_Bs2DsPi"]      = 0.0 # 3
-    configdict["aprod_Lb2LcK"]       = 0.0 # 3
-    configdict["aprod_Lb2LcPi"]      = 0.0 # 3
-    configdict["aprod_Combo"]     = 0.0 #3
-    configdict["aprod_Lb2Dsp"]       = 0.0 #3
-    configdict["aprod_Lb2Dsstp"]     = 0.0 #3
-    configdict["aprod_LM1"]       = 0.0 #3
-    configdict["aprod_Bs2DsstPi"]    = 0.0 #3
-    configdict["aprod_Bs2DsRho"]     = 0.0 #3
-                                    
-    configdict["atageff_Signal"]    = [0.0, 0.0, 0.0]
-    configdict["atageff_Bd2DK"]        = [0.0, 0.0, 0.0]
-    configdict["atageff_Bd2DPi"]       = [0.0, 0.0, 0.0]
-    configdict["atageff_Bd2DsK"]    = [0.0, 0.0, 0.0]
-    configdict["atageff_Bs2DsPi"]      = [0.0, 0.0, 0.0]
-    configdict["atageff_Lb2LcK"]       = [0.0, 0.0, 0.0]
-    configdict["atageff_Lb2LcPi"]      = [0.0, 0.0, 0.0]
-    configdict["atageff_Combo"]     = [0.0, 0.0, 0.0]
-    configdict["atageff_Lb2Dsp"]       = [0.0, 0.0, 0.0]
-    configdict["atageff_Lb2Dsstp"]     = [0.0, 0.0, 0.0]
-    configdict["atageff_LM1"]       = [0.0, 0.0, 0.0]
-    configdict["atageff_Bs2DsstPi"]    = [0.0, 0.0, 0.0]
-    configdict["atageff_Bs2DsRho"]     = [0.0, 0.0, 0.0]
-
-    configdict["adet_Signal"]    = 0.0
-    configdict["adet_Bd2DK"]        = 0.0
-    configdict["adet_Bd2DPi"]       = 0.0
-    configdict["adet_Bd2DsK"]    = 0.0
-    configdict["adet_Bs2DsPi"]      = 0.0
-    configdict["adet_Lb2LcK"]       = 0.0
-    configdict["adet_Lb2LcPi"]      = 0.0
-    configdict["adet_Combo"]     = 0.0
-    configdict["adet_Lb2Dsp"]       = 0.0
-    configdict["adet_Lb2Dsstp"]     = 0.0
-    configdict["adet_LM1"]       = 0.0
-    configdict["adet_Bs2DsstPi"]    = 0.0
-    configdict["adet_Bs2DsRho"]     = 0.0
-    
-    configdict["num_Signal"]    = [309, 576, 475, 107,  301]
-    configdict["num_Bd2DK"]        = [17,    0,   5,   0,    0]
-    configdict["num_Bd2DPi"]       = [14,    3,   3,   0,    0]
-    configdict["num_Bd2DsK"]    = [18,   34,  39,  9,   27]
-    configdict["num_Bs2DsPi"]      = [225*0.986*0.648, 498*0.986*0.648, 327*0.986*0.648, 89*0.986*0.648, 258*0.986*0.648]
-    configdict["num_Lb2LcK"]       = [15,    2,   4,   0,    0]
-    configdict["num_Lb2LcPi"]      = [11,    1,   3,   0,    0]
-    configdict["num_Combo"]     = [487, 311, 258, 428, 946]
-    configdict["num_Lb2Dsp"]       = [225*0.014*0.75, 498*0.014*0.75, 327*0.014*0.75, 89*0.014*0.75, 258*0.014*0.75]
-    configdict["num_Lb2Dsstp"]     = [225*0.014*0.25, 498*0.014*0.25, 327*0.014*0.25, 89*0.014*0.25, 258*0.014*0.25]
-    configdict["num_LM1"]       = [0,     0,   0,   0,    0]
-    configdict["num_Bs2DsstPi"]    = [225*0.986*0.352*0.5, 498*0.986*0.352*0.5, 327*0.986*0.352*0.5, 89*0.986*0.352*0.5, 258*0.986*0.352*0.5]
-    configdict["num_Bs2DsRho"]     = [225*0.986*0.352*0.5, 498*0.986*0.352*0.5, 327*0.986*0.352*0.5, 89*0.986*0.352*0.5, 258*0.986*0.352*0.5]
-
-    #----------------------------Signal----------------------------#
-
-    configdict["mean"]    = [5367.51, 5367.51, 5367.51, 5367.51, 5367.51]
-
-    configdict["sigma1"]  = [1.0717e+01*1.28,  1.1235e+01*1.28,  1.0772e+01*1.28,  1.1268e+01*1.28,  1.1391e+01*1.28 ]
-    configdict["sigma2"]  = [1.6005e+01*1.22,  1.7031e+01*1.22,  1.5339e+01*1.22,  1.9408e+01*1.22,  1.7647e+01*1.22 ]
-    configdict["alpha1"]  = [2.2118e+00,       2.2144e+00,       2.0480e+00,       2.3954e+00,       2.0930e+00 ]
-    configdict["alpha2"]  = [-2.4185e+00,      -2.1918e+00,      -2.0291e+00,      -3.4196e+00,      -2.3295e+00]
-    configdict["n1"]      = [1.0019e+00,       1.1193e+00,       1.2137e+00,       9.8202e-01,       1.2674e+00 ]
-    configdict["n2"]      = [3.1469e+00,       3.6097e+00,       6.5735e+00,       5.2237e-01,       4.0195e+00 ]
-    configdict["frac"]    = [6.1755e-01,       7.0166e-01,       5.8012e-01,       7.8103e-01,       7.0398e-01]
-
-
-    configdict["ratio1"]  = 0.998944636665
-    configdict["ratio2"]  = 1.00022181515
-
-    configdict["meanDs"]    = [1968.49, 1968.49, 1968.49, 1968.49, 1968.49]
-
-    configdict["sigma1Ds"]  = [5.3468e+00*1.16,  8.2412e+00*1.16,  6.0845e+00*1.16,  8.8531e+00*1.16,  8.0860e+00*1.16 ]
-    configdict["sigma2Ds"]  = [5.1848e+00*1.19,  4.4944e+00*1.19,  5.1266e+00*1.19,  5.2073e+00*1.19,  7.3773e+00*1.19 ]
-    configdict["alpha1Ds"]  = [1.2252e+00,       1.9827e+00,       1.1316e+00,       1.7131e+00,       9.0639e-01 ]
-    configdict["alpha2Ds"]  = [-1.1167e+00,      -3.0525e+00,      -1.3760e+00,      -2.5276e+00,      -1.1122e+00]
-    configdict["n1Ds"]      = [4.6625e+00,       1.4867e+00,       1.3280e+01,       2.0239e+00,       1.1486e+01 ]
-    configdict["n2Ds"]      = [6.9989e+01,       6.1022e-01,       1.1017e+01,       1.0860e+00,       4.0001e+01 ]
-    configdict["fracDs"]    = [4.7565e-01,       3.9628e-01 ,      4.0048e-01,       5.5084e-01,       4.8729e-01 ]
-
-           
-    configdict["cB"] = [-3.17e-03, -1.82e-03, -2.91e-03, -1.09e-03, -1.55e-03]
-    configdict["cD"] = [-4.29e-03, -2.92e-03, -3.39e-03, -0.0,      -1.97e-03]
-    configdict["fracDsComb"] = [0.95, 0.54, 0.80,  1.0, 1.0]
-
-    configdict["fracPIDKComb1"] = 0.504
-    configdict["fracPIDKComb2"] = 0.346
-       
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForGenerator5M_WithProdDetAsy.py b/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForGenerator5M_WithProdDetAsy.py
deleted file mode 100644
index b9856b03683fa13e1a929fd146d8c18061046928..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForGenerator5M_WithProdDetAsy.py
+++ /dev/null
@@ -1,34 +0,0 @@
-def getconfig() :
-
-    from Bs2DsKConfigForGenerator5M import getconfig as getconfig_nominal
-    baselineconfig = getconfig_nominal()
-
-    baselineconfig["aprod_Signal"]       = -0.0175698 #-0.014 #0.03
-    baselineconfig["aprod_Bd2DK"]        = 0.00943518 #0.011 #0.03
-    baselineconfig["aprod_Bd2DPi"]       = 0.00943518 #0.011 #0.03 
-    baselineconfig["aprod_Bd2DsK"]       = 0.00943518 #0.011 #3
-    baselineconfig["aprod_Bs2DsPi"]      = -0.0175698 #-0.014 # 3
-    baselineconfig["aprod_Lb2LcK"]       = 0.0301775 #0.03 # 3
-    baselineconfig["aprod_Lb2LcPi"]      = 0.0301775 #0.03 # 3
-    baselineconfig["aprod_Combo"]        = -0.01 #3
-    baselineconfig["aprod_Lb2Dsp"]       = 0.0301775 #0.03 #3
-    baselineconfig["aprod_Lb2Dsstp"]     = 0.0301775 #0.03 #3
-    baselineconfig["aprod_LM1"]          = 0.03 #3
-    baselineconfig["aprod_Bs2DsstPi"]    = -0.0175698 #-0.014 #3
-    baselineconfig["aprod_Bs2DsRho"]     = -0.0175698 #-0.014 #3
-
-    baselineconfig["adet_Signal"]       = 0.0100562 #0.01
-    baselineconfig["adet_Bd2DK"]        = 0.0100174 #0.02
-    baselineconfig["adet_Bd2DPi"]       = 0.00502173 #0.01
-    baselineconfig["adet_Bd2DsK"]       = 0.0100562 #0.01
-    baselineconfig["adet_Bs2DsPi"]      = 0.00608738 #0.005
-    baselineconfig["adet_Lb2LcK"]       = 0.00990014 #-0.01
-    baselineconfig["adet_Lb2LcPi"]      = 0.00515764 #-0.02
-    baselineconfig["adet_Combo"]        = 0.00987629 #0.01
-    baselineconfig["adet_Lb2Dsp"]       = 0.0199224 #0.03
-    baselineconfig["adet_Lb2Dsstp"]     = 0.0198115 #0.03
-    baselineconfig["adet_LM1"]          = 0.01
-    baselineconfig["adet_Bs2DsstPi"]    = 0.00491299 #0.005
-    baselineconfig["adet_Bs2DsRho"]     = 0.00488479 #0.005
-    
-    return baselineconfig
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForNominalGammaFit.py b/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForNominalGammaFit.py
deleted file mode 100644
index 531b360c279332ec43451d89913edf44eee73cbc..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForNominalGammaFit.py
+++ /dev/null
@@ -1,135 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]      =  0.661 #0.661   # in ps^{-1}
-    configdict["DeltaGammas"] = -0.105 #-0.105
-    configdict["DeltaMs"]     =  17.768   # in ps^{-1}
-    configdict["StrongPhase"] = -40. / 180. * pi
-    configdict["WeakPhase"]   = 100. / 180. * pi
-    configdict["ArgLf"]       = configdict["StrongPhase"] - configdict["WeakPhase"]
-    configdict["ArgLbarfbar"] = configdict["StrongPhase"] + configdict["WeakPhase"]
-    configdict["ModLf"]       = 0.372
-    
-    configdict["calibration_p0"]  = [0.3834, 0.4244]
-    configdict["calibration_p1"]  = [0.9720, 1.2180]
-    configdict["calibration_av"]  = [0.3813, 0.4097]
-
-    configdict["constr_p0_B"] = [0.365517, 0.424801, 0.338781]
-    configdict["constr_p1_B"] = [0.950216, 1.004340, 0.971845]
-    configdict["constr_av_B"] = [0.371147, 0.414892, 0.338493]
-
-    configdict["constr_p0_Bbar"] = [0.376730, 0.404896, 0.338363]
-    configdict["constr_p1_Bbar"] = [1.048155, 0.995879, 1.027861]
-    configdict["constr_av_Bbar"] = [0.371147, 0.414892, 0.338493]
-
-    configdict["constr_p0_B_err"] = [0.00, 0.00, 0.00]
-    configdict["constr_p1_B_err"] = [0.00, 0.00, 0.00]
-    configdict["constr_p0_Bbar_err"] = [0.00, 0.00, 0.00]
-    configdict["constr_p1_Bbar_err"] = [0.00, 0.00, 0.00]
-
-
-    #configdict["constr_p0_B_err"] = [0.004389, 0.007146, 0.005959]
-    #configdict["constr_p1_B_err"] = [0.039917, 0.148797, 0.038725]
-    #configdict["constr_p0_Bbar_err"] = [0.004395, 0.011414, 0.006030]
-    #configdict["constr_p1_Bbar_err"] = [0.040072, 0.150355, 0.039962]
-
-
-
-    #configdict["calibration_p0"]  = [0.3927, 0.4244]
-    #configdict["calibration_p1"]  = [0.9818, 1.2550]
-    #configdict["calibration_av"]  = [0.3919, 0.4097]
-    
-    configdict["tacc_size"]   = 6
-    configdict["tacc_knots"]  = [0.5, 1.0, 1.5, 2.0, 3.0, 12.0]
-    
-    #configdict["tacc_values"] = [1.4525e-01*1.86413e-01/1.93184e-01,
-    #                             2.0995e-01*2.83214e-01/3.35302e-01,
-    #                             6.2524e-01*7.24952e-01/7.39033e-01,
-    #                             1.0291e+00*1.18847e+00/1.16141e+00,
-    #                             1.2577e+00*1.33798e+00/1.29660e+00,
-    #                             1.2405e+00*1.32593e+00/1.31712e+00]
-    configdict["tacc_values"] = [0.4453873694523979, 0.6869245867352556, 0.8719680916278891, 1.1614426699209424, 1.2341250036543179, 1.2852701638596233]
-    
-    configdict["tagEff_OS"] = 0.387
-    configdict["tagEff_SS"] = 0.4772
-    configdict["adet_Signal"] = 0.01
-    configdict["TagEffSig"]    = [configdict["tagEff_OS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                  configdict["tagEff_SS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                  configdict["tagEff_OS"]*configdict["tagEff_SS"]]
-
-    configdict["aTagEffSig"]    = [-0.002756, 0.001837, -0.002315]
-    
-    configdict["resolutionScaleFactor"] = 1.37 
-    configdict["resolutionMeanBias"]    = 0.
-    
-    configdict["resolutionSigma1"] = 2.21465e-02
-    configdict["resolutionSigma2"] = 3.72057e-02
-    configdict["resolutionSigma3"] = 6.37859e-02
-    configdict["resolutionFrac1"]  = 3.62689e-01
-    configdict["resolutionFrac2"]  = 5.65100e-01
-        
-    configdict["MistagFile"]     = "../data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root"
-    configdict["MistagWork"]     = "workspace"
-    configdict["MistagTempName"] = ["sigMistagPdf_1", "sigMistagPdf_2", "sigMistagPdf_3"]
-    
-    configdict["TerrFile"]     = "../data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root"
-    configdict["TerrWork"]     = "workspace"
-    configdict["TerrTempName"] = "TimeErrorPdf_Bs2DsK"
-
-
-    configdict["Constrains"] = {
-        # multivariate Gaussian constraint for tagging calibration parameters
-        'multivar_Bs2DsKMistagCalib_p0p1': [
-            # variable names
-            [   'p0_B_0', 'p1_B_0', #B
-                'p0_B_1', 'p1_B_1', #B
-                'p0_B_2', 'p1_B_2', #B
-                'p0_Bbar_0', 'p1_Bbar_0', #Bbar
-                'p0_Bbar_1', 'p1_Bbar_1', #Bbar
-                'p0_Bbar_2', 'p1_Bbar_2', ], #Bbar 
-            # errors
-            [   0.004389, 0.039917, 0.007146, 0.148797, 0.005959, 0.038725,
-                0.004395, 0.040072, 0.011414, 0.150355, 0.006030, 0.039962, ],
-            # correlation matrix
-            [   [  1.000000000, -0.111790756,  0.000000000,  0.000000000,  0.495659195, -0.121263673,  0.883403568, -0.090341177,  0.000000000,  0.000000000,  0.436308995, -0.115934567 ],
-                [ -0.111790756,  1.000000000,  0.000000000,  0.000000000, -0.170723691,  0.368653977, -0.090433543,  0.808300854,  0.000000000,  0.000000000, -0.138612127,  0.303210400 ],
-                [  0.000000000,  0.000000000,  1.000000000, -0.122610568,  0.658158523, -0.541239353,  0.000000000,  0.000000000,  0.938782519, -0.120298908,  0.633382320, -0.525375965 ],
-                [  0.000000000,  0.000000000, -0.122610568,  1.000000000, -0.631056425,  0.811985505,  0.000000000,  0.000000000, -0.122445304,  0.986409445, -0.608419498,  0.787887823 ],
-                [  0.495659195, -0.170723691,  0.658158523, -0.631056425,  1.000000000, -0.874463407,  0.436823522, -0.137898963,  0.622128000, -0.622176239,  0.940276558, -0.841479510 ],
-                [ -0.121263673,  0.368653977, -0.541239353,  0.811985505, -0.874463407,  1.000000000, -0.104272659,  0.297793832, -0.514032745,  0.800698231, -0.830102616,  0.950602614 ],
-                [  0.883403568, -0.090433543,  0.000000000,  0.000000000,  0.436823522, -0.104272659,  1.000000000, -0.111883376,  0.000000000,  0.000000000,  0.494752953, -0.134191009 ],
-                [ -0.090341177,  0.808300854,  0.000000000,  0.000000000, -0.137898963,  0.297793832, -0.111883376,  1.000000000,  0.000000000,  0.000000000, -0.170921923,  0.374807565 ],
-                [  0.000000000,  0.000000000,  0.938782519, -0.122445304,  0.622128000, -0.514032745,  0.000000000,  0.000000000,  1.000000000, -0.123454584,  0.672735926, -0.556618676 ],
-                [  0.000000000,  0.000000000, -0.120298908,  0.986409445, -0.622176239,  0.800698231,  0.000000000,  0.000000000, -0.123454584,  1.000000000, -0.616497607,  0.798523473 ],
-                [  0.436308995, -0.138612127,  0.633382320, -0.608419498,  0.940276558, -0.830102616,  0.494752953, -0.170921923,  0.672735926, -0.616497607,  1.000000000, -0.878334170 ],
-                [ -0.115934567,  0.303210400, -0.525375965,  0.787887823, -0.841479510,  0.950602614, -0.134191009,  0.374807565, -0.556618676,  0.798523473, -0.878334170,  1.000000000 ], ],
-            ],
-        'multivar_Bs2DsKTagEffAsyms': [
-            [   'tagEffSig_1', 'tagEffSig_2', 'tagEffSig_3',
-                'aTagEff_1', 'aTagEff_2', 'aTagEff_3' ],
-            [   0.001952, 0.002330, 0.001843, 0.001628, 0.001029, 0.001629 ],
-            [   [   1.0000000000000000e+00,  -9.6310597862753633e-01,   2.4948159233783404e-01,   1.0144953478135443e-02,   7.0203224420703663e-03,   1.0233976427853671e-02 ],
-                [  -9.6310597862753633e-01,   1.0000000000000000e+00,   2.0335415458912924e-02,  -8.0556554583657968e-03,  -5.7778847902391142e-03,  -8.1729979402554217e-03 ],
-                [   2.4948159233783404e-01,   2.0335415458912924e-02,   1.0000000000000000e+00,   8.9803482925014111e-03,   5.0106145332872738e-03,   8.8849526862593686e-03 ],
-                [   1.0144953478135443e-02,  -8.0556554583657968e-03,   8.9803482925014111e-03,   1.0000000000000000e+00,  -9.9965299841531974e-01,   9.9878828433569355e-01 ],
-                [   7.0203224420703663e-03,  -5.7778847902391142e-03,   5.0106145332872738e-03,  -9.9965299841531974e-01,   1.0000000000000000e+00,  -9.9759036187377381e-01 ],
-                [   1.0233976427853671e-02,  -8.1729979402554217e-03,   8.8849526862593686e-03,   9.9878828433569355e-01,  -9.9759036187377381e-01,   1.0000000000000000e+00 ], ],
-            ],
-        }
-    
-        
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas')
-    configdict["constParams"].append('deltaGammas')
-    configdict["constParams"].append('deltaMs')
-    #configdict["constParams"].append('tagEffSig')
-    configdict["constParams"].append('tacc_exponent_BDTGA')
-    configdict["constParams"].append('tacc_offset_BDTGA')
-    configdict["constParams"].append('tacc_beta_BDTGA')
-    configdict["constParams"].append('tacc_turnon_BDTGA')
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForNominalGammaFitToys5M.py b/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForNominalGammaFitToys5M.py
deleted file mode 100644
index efbd3935f791537ac8b7ebf38267822e0adfb5da..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForNominalGammaFitToys5M.py
+++ /dev/null
@@ -1,86 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]      =  0.661   # in ps^{-1}
-    configdict["DeltaGammas"] = -0.105
-    configdict["DeltaMs"]     =  17.768   # in ps^{-1}
-    configdict["TagEffSig"]   = 0.403 #392 #403
-    configdict["TagOmegaSig"] = 0.391
-    configdict["StrongPhase"] = 4. / 180. * pi
-    configdict["WeakPhase"]   = 116. / 180. * pi
-    configdict["ArgLf"]       = configdict["StrongPhase"] - configdict["WeakPhase"]
-    configdict["ArgLbarfbar"] = configdict["StrongPhase"] + configdict["WeakPhase"]
-    configdict["ModLf"]       = 0.51
-    
-    configdict["calibration_p0"]  = [0.3927, 0.4244]
-    configdict["calibration_p1"]  = [0.9818, 1.2550]
-    configdict["calibration_av"]  = [0.3919, 0.4097]
-
-    configdict["constr_p0_B"] = [0.0, 0.0, 0.0]
-    configdict["constr_p1_B"] = [1.0, 1.0, 1.0]
-    configdict["constr_av_B"] = [0.0, 0.0, 0.0]
-
-    configdict["constr_p0_Bbar"] = [0.0, 0.0, 0.0]
-    configdict["constr_p1_Bbar"] = [1.0, 1.0, 1.0]
-    configdict["constr_av_Bbar"] = [0.0, 0.0, 0.0]
-                    
-    configdict["resolutionScaleFactor"] = 1.37 
-    configdict["resolutionMeanBias"]    = 0.
-    
-    configdict["resolutionSigma1"] = 2.21465e-02
-    configdict["resolutionSigma2"] = 3.72057e-02
-    configdict["resolutionSigma3"] = 6.37859e-02
-    configdict["resolutionFrac1"]  = 3.62689e-01
-    configdict["resolutionFrac2"]  = 5.65100e-01
-
-    configdict["tacc_size"]   = 6
-    configdict["tacc_knots"]  = [0.5, 1.0, 1.5, 2.0, 3.0, 12.0]
-    configdict["tacc_values"] = [0.4453873694523979, 0.6869245867352556, 0.8719680916278891, 1.1614426699209424, 1.2341250036543179, 1.2852701638596233]
-
-    configdict["tagEff_OS"] = 0.387
-    configdict["tagEff_SS"] = 0.4772
-    
-    configdict["TagEffSig"]    = [configdict["tagEff_OS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                  configdict["tagEff_SS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                  configdict["tagEff_OS"]*configdict["tagEff_SS"]]
-    
-    configdict["aTagEffSig"]    = [0.0, 0.0, 0.0]
-                
-    configdict["MistagFile"]     = "../data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root"
-    configdict["MistagWork"]     = "workspace"
-    configdict["MistagTempName"] = ["sigMistagPdf_1", "sigMistagPdf_2", "sigMistagPdf_3"]
-    
-    configdict["TerrFile"]     = "../data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root"
-    configdict["TerrWork"]     = "workspace"
-    configdict["TerrTempName"] = "TimeErrorPdf_Bs2DsK"
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas')
-    configdict["constParams"].append('deltaGammas')
-    configdict["constParams"].append('deltaMs')
-    #configdict["constParams"].append('tagEffSig')
-    configdict["constParams"].append('tacc_exponent')
-    configdict["constParams"].append('tacc_offset')
-    configdict["constParams"].append('tacc_beta')
-    configdict["constParams"].append('tacc_turnon')
-    
-    configdict["constParams"].append('p0_B_0')
-    configdict["constParams"].append('p0_B_1')
-    configdict["constParams"].append('p0_B_2')
-    configdict["constParams"].append('p0_Bbar_0')
-    configdict["constParams"].append('p0_Bbar_1')
-    configdict["constParams"].append('p0_Bbar_2')
-
-    configdict["constParams"].append('p1_B_0')
-    configdict["constParams"].append('p1_B_1')
-    configdict["constParams"].append('p1_B_2')
-    configdict["constParams"].append('p1_Bbar_0')
-    configdict["constParams"].append('p1_Bbar_1')
-    configdict["constParams"].append('p1_Bbar_2')
-
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForNominalGammaFitToys5M_WithProdDetAsy.py b/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForNominalGammaFitToys5M_WithProdDetAsy.py
deleted file mode 100644
index 5fc7ed66f46570192c1ba8d7e840ff8407c4c9fa..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForNominalGammaFitToys5M_WithProdDetAsy.py
+++ /dev/null
@@ -1,9 +0,0 @@
-def getconfig() :
-
-    from Bs2DsKConfigForNominalGammaFitToys5M import getconfig as getconfig_nominal
-    baselineconfig = getconfig_nominal()
-
-    baselineconfig["aprod_Signal"] = -0.0175698 #-0.014
-    baselineconfig["adet_Signal"]  = 0.0100562 #0.01 
-
-    return baselineconfig
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFit.py b/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFit.py
deleted file mode 100644
index 97f8b35e7094397539d64837bd688d8887b0ceaf..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFit.py
+++ /dev/null
@@ -1,189 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bs2DsK"
-    configdict["CharmModes"] = {"NonRes","PhiPi","KstK","KPiPi","PiPiPi"} 
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2011"} 
-    # stripping (necessary in case of PIDK shapes)
-    configdict["Stripping"] = {"2011":"17"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes) 
-    configdict["IntegratedLuminosity"] = {"2011": {"Down": 0.59, "Up": 0.44}}
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "../data/Bs2DsK_1fbCPV/Bs2DsK/config_Bs2Dsh2011TDAna_Bs2DsK.txt"
-
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsK", "Extension":"C"}
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [1.61,    5.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.3,     1.0     ], "InputName" : "BDTGResponse_1"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3834, "p1": 0.9720, "average": 0.3813}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4244, "p1": 1.2180, "average": 0.4097}
-
-    # additional cuts applied to data sets
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0",            "MC" : "lab2_TAU>0&&lab1_M>200", "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                     
-    # order of particles: KKPi, KPiPi, PiPiPi                                
-    configdict["DsChildrenPrefix"] = {"Child1":"lab5","Child2":"lab4","Child3": "lab3"}
-
-    # additional variables in data sets 
-    configdict["AdditionalVariables"] = {}
-    configdict["AdditionalVariables"]["tagOmegaSSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_SS_Kaon_PROB"}
-    configdict["AdditionalVariables"]["tagDecSSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_SS_Kaon_DEC"}
-    configdict["AdditionalVariables"]["tagOmegaOSMuon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Muon_PROB"}
-    configdict["AdditionalVariables"]["tagDecOSMuon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Muon_DEC"}
-    configdict["AdditionalVariables"]["tagOmegaOSElectron"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Electron_PROB"}
-    configdict["AdditionalVariables"]["tagDecSSElectron"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Electron_DEC"}
-    configdict["AdditionalVariables"]["tagOmegaOSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Kaon_PROB"}
-    configdict["AdditionalVariables"]["tagDecOSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Kaon_DEC"}
-    configdict["AdditionalVariables"]["tagOmegaOSnnetKaon"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_nnetKaon_PROB"}
-    configdict["AdditionalVariables"]["tagDecOSnnetKaon"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_nnetKaon_DEC"}
-    configdict["AdditionalVariables"]["tagOmegaOSVtxCharge"] =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_VtxCharge_PROB"}
-    configdict["AdditionalVariables"]["tagDecOSVtxCharge"]   =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_VtxCharge_DEC" }
-
-    #weighting templates by PID eff/misID
-    configdict["WeightingMassTemplates"]= { "Variables":["lab4_P","lab5_P"], "PIDBach": 5, "PIDChild": 0, "PIDProton": 5, "RatioDataMC":True }
-    
-    #weighting for PID templates
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[20,20] }
-
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID5_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID5_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID5_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID5_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]   = {}
-    configdict["Calibrations"]["2011"]["Proton"]["Up"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibLam_Up_P_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]["Down"] = { "FileName": "/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibLam_Down_P_PID5_Str21r1.root"}
-
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/work_Comb_Up_DsK_5358.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/work_Comb_Down_DsK_5358.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-
-    # Bs signal shapes                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBall"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"2011": {"NonRes":1.0717e+01,  "PhiPi":1.1235e+01,  "KstK":1.0772e+01,  "KPiPi":1.1268e+01,  "PiPiPi":1.1391e+01}, "Fixed":True}
-    configdict["BsSignalShape"]["sigma2"]  = {"2011": {"NonRes":1.6005e+01,  "PhiPi":1.7031e+01,  "KstK":1.5339e+01,  "KPiPi":1.9408e+01,  "PiPiPi":1.7647e+01}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha1"]  = {"2011": {"NonRes":2.2118e+00,  "PhiPi":2.2144e+00,  "KstK":2.0480e+00,  "KPiPi":2.3954e+00,  "PiPiPi":2.0930e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha2"]  = {"2011": {"NonRes":-2.4185e+00, "PhiPi":-2.1918e+00, "KstK":-2.0291e+00, "KPiPi":-3.4196e+00, "PiPiPi":-2.3295e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["n1"]      = {"2011": {"NonRes":1.0019e+00,  "PhiPi":1.1193e+00,  "KstK":1.2137e+00,  "KPiPi":9.8202e-01,  "PiPiPi":1.2674e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"2011": {"NonRes":3.1469e+00,  "PhiPi":3.6097e+00,  "KstK":6.5735e+00,  "KPiPi":5.2237e-01,  "PiPiPi":4.0195e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["frac"]    = {"2011": {"NonRes":6.1755e-01,  "PhiPi":7.0166e-01,  "KstK":5.8012e-01,  "KPiPi":7.8103e-01,  "PiPiPi":7.0398e-01}, "Fixed":True}
-    configdict["BsSignalShape"]["scaleSigma"] = { "2011": {"frac1": 1.22, "frac2":1.28}}
-
-    #Ds signal shapes                                                                                                
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBall"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma1"]  = {"2011": {"NonRes":5.3468e+00,  "PhiPi":8.2412e+00,  "KstK":6.0845e+00,  "KPiPi":8.8531e+00,  "PiPiPi":8.0860e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["sigma2"]  = {"2011": {"NonRes":5.1848e+00,  "PhiPi":4.4944e+00,  "KstK":5.1266e+00,  "KPiPi":5.2073e+00,  "PiPiPi":7.3773e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha1"]  = {"2011": {"NonRes":1.2252e+00,  "PhiPi":1.9827e+00,  "KstK":1.1316e+00,  "KPiPi":1.7131e+00,  "PiPiPi":9.0639e-01}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha2"]  = {"2011": {"NonRes":-1.1167e+00, "PhiPi":-3.0525e+00, "KstK":-1.3760e+00, "KPiPi":-2.5276e+00, "PiPiPi":-1.1122e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["n1"]      = {"2011": {"NonRes":4.6625e+00,  "PhiPi":1.4867e+00,  "KstK":1.3280e+01,  "KPiPi":2.0239e+00,  "PiPiPi":1.1486e+01}, "Fixed":True}
-    configdict["DsSignalShape"]["n2"]      = {"2011": {"NonRes":6.9989e+01,  "PhiPi":6.1022e-01,  "KstK":1.1017e+01,  "KPiPi":1.0860e+00,  "PiPiPi":4.0001e+01}, "Fixed":True}
-    configdict["DsSignalShape"]["frac"]    = {"2011": {"NonRes":4.7565e-01,  "PhiPi":3.9628e-01,  "KstK":4.0048e-01,  "KPiPi":5.5084e-01,  "PiPiPi":4.8729e-01}, "Fixed":True}
-    configdict["DsSignalShape"]["scaleSigma"] = { "2011": {"frac1": 1.16, "frac2":1.19}}
- 
-    # combinatorial background                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"] = "Exponential"
-    configdict["BsCombinatorialShape"]["cB"]   = {"2011":{"NonRes":-1.1530e-03,  "PhiPi":-9.2354e-04,  "KstK":-1.3675e-03, "KPiPi":-9.8158e-04, "PiPiPi":-1.0890e-03}, "Fixed":False}
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal"
-    configdict["DsCombinatorialShape"]["cD"]    = {"2011": {"NonRes":-4.4329e-03,  "PhiPi":-8.8642e-03,  "KstK":-5.2652e-03, "KPiPi":-1.0743e-03, "PiPiPi":-1.1877e-03}, "Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"] = {"2011": {"NonRes":4.3067e-01,   "PhiPi":6.5400e-01,   "KstK":3.7409e-01,  "KPiPi":1.0,         "PiPiPi":1.0},         
-                                                   "Fixed":{"KPiPi":True, "PiPiPi":True}}
-
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":True }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "2011":{"All":0.5}, "2012":{"All":0.5}, "Fixed":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK2"]   = { "2011":{"All":0.5}, "2012":{"All":0.5}, "Fixed":False }
-
-    #Bd2Dsh background                                                                                           
-    #shape for BeautyMass, for CharmMass as well as BacPIDK taken by default the same as signal                                                                
-    configdict["Bd2Ds(st)XShape"] = {}
-    configdict["Bd2Ds(st)XShape"]["type"]    = "ShiftedSignal"
-    configdict["Bd2Ds(st)XShape"]["decay"]   = "Bd2DsK"
-    configdict["Bd2Ds(st)XShape"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2Ds(st)XShape"]["scale1"]  = {"Run1": {"All": 0.998944636665}, "Fixed":True}
-    configdict["Bd2Ds(st)XShape"]["scale2"]  = {"Run1": {"All": 1.00022181515}, "Fixed":True}
-
-    #                                                                                                                                                                                 
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"2011":{"All":{"Both":{ "CentralValue":1.0, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g2_f1_frac"] = {"2011":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g2_f2_frac"] = {"2011":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g3_f1_frac"] = {"2011":{"All":{"Both":{ "CentralValue":0.75,"Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g5_f1_frac"] = {"2011":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-
-    #expected yields                                                                                                                                                              
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bd2DPi"]             = {"2011": {"NonRes":14.0,    "PhiPi":0.0,    "KstK":3.0,    "KPiPi":3.0,    "PiPiPi":0.0},      "Fixed":True}
-    configdict["Yields"]["Bd2DK"]              = {"2011": {"NonRes":17.0,    "PhiPi":0.0,    "KstK":5.0,    "KPiPi":0.0,    "PiPiPi":0.0},      "Fixed":True}
-    configdict["Yields"]["Lb2LcPi"]            = {"2011": {"NonRes":11.0,    "PhiPi":1.0,    "KstK":3.0,    "KPiPi":0.0,    "PiPiPi":0.0},      "Fixed":True}
-    configdict["Yields"]["Lb2LcK"]             = {"2011": {"NonRes":15.0,    "PhiPi":2.0,    "KstK":4.0,    "KPiPi":0.0,    "PiPiPi":0.0},      "Fixed":True}
-    configdict["Yields"]["Bs2DsDsstKKst"]      = {"2011": {"NonRes":50.0,    "PhiPi":50.0,   "KstK":50.0,   "KPiPi":50.0,   "PiPiPi":50.0},     "Fixed":False}
-    configdict["Yields"]["BsLb2DsDsstPPiRho"]  = {"2011": {"NonRes":225.0,   "PhiPi":500.0,  "KstK":330.0,  "KPiPi":90.0,   "PiPiPi":260.0},    "Fixed":False}
-    configdict["Yields"]["CombBkg"]            = {"2011": {"NonRes":1000.0,  "PhiPi":1000.0, "KstK":1000.0, "KPiPi":1000.0, "PiPiPi":10000.0},  "Fixed":False}
-    configdict["Yields"]["Signal"]             = {"2011": {"NonRes":1000.0,  "PhiPi":1000.0, "KstK":1000.0, "KPiPi":1000.0, "PiPiPi":10000.0} , "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#            
-    ###                                                               MDfit plotting settings                                                                                 
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------# 
- 
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = { "EPDF": ["Sig", "CombBkg", "Lb2LcK", "Lb2LcPi", "Bd2DK", "Bd2DPi","BsLb2DsDsstPPiRho", "Bs2DsDsstKKst"],
-                                                 "PDF":  ["Sig", "CombBkg", "Lb2LcK", "Lb2LcPi", "Lb2DsDsstP", "Bs2DsDsstPiRho", "Bd2DK", "Bd2DPi","Bs2DsDsstKKst"],
-                                                 "Legend": ["Sig", "CombBkg", "Lb2LcKPi", "Lb2DsDsstP", "Bs2DsDsstPiRho", "Bd2DKPi","Bs2DsDsstKKst"]}
-    configdict["PlotSettings"]["colors"] = { "PDF": [kRed-7, kMagenta-2, kGreen-3, kGreen-3, kYellow-9, kBlue-6, kRed, kRed, kBlue-10],
-                                             "Legend": [kRed-7, kMagenta-2, kGreen-3, kYellow-9, kBlue-6, kRed, kBlue-10]}
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66], 
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitToys5M.py b/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitToys5M.py
deleted file mode 100644
index 68429e72bd3e9fe76cf0eebb953439257ad887ae..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitToys5M.py
+++ /dev/null
@@ -1,115 +0,0 @@
-from __future__ import division
-from past.utils import old_div
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # PHYSICAL PARAMETERS
-    configdict["BMass"]      = [5300,    5800    ]
-    configdict["DMass"]      = [1930,    2015    ]
-    configdict["Time"]       = [0.2,     15.0    ]
-    configdict["Momentum"]   = [3000.0,  650000.0]
-    configdict["TrMom"]      = [400.0,   45000.0 ]
-    configdict["PIDK"]       = [0.0,     150.0   ]
-    configdict["nTracks"]    = [15.0,    1000.0  ]
-
-    configdict["TagDec"]     = ["lab0_TAGDECISION_OS","lab0_SS_nnetKaon_DEC"]
-    configdict["lab0_TAGDECISION_OS"]  = [-1.0, 1.0]
-    configdict["lab0_SS_nnetKaon_DEC"] = [-1.0, 1.0]
-    
-    configdict["TagOmega"]   = ["lab0_TAGOMEGA_OS","lab0_SS_nnetKaon_PROB"]
-    configdict["lab0_TAGOMEGA_OS"]  = [0.0, 0.5]
-    configdict["lab0_SS_nnetKaon_PROB"] = [0.0, 0.5]
-    
-    configdict["calibration_p0"]  = [0.3927, 0.4244]
-    configdict["calibration_p1"]  = [0.9818, 1.2550]
-    configdict["calibration_av"]  = [0.3919, 0.4097]
-        
-    configdict["Terr"]       = [0.01,    0.1     ]
-    configdict["BachCharge"] = [-1000.0, 1000.0  ]
-    configdict["BDTG"]       = [0.3,     1.0     ]
-                                            
-                               
-    configdict["Bin1"]      = 20
-    configdict["Bin2"]      = 20
-    configdict["Var1"]      = "lab1_PT"
-    configdict["Var2"]      = "nTracks"
-    configdict["WeightingDimensions"] = 2                                 
-    
-    
-    configdict["PIDBach"]    = 5
-    configdict["PIDChild"]   = 0
-    configdict["PIDProton"]  = 5    
-    configdict["dataName"]   = "../data/config_Bs2Dsh2011TDAna_Bs2DsK.txt"
-
-    configdict["fileCalibPionUp"]  = "/afs/cern.ch/work/a/adudziak/public/workspace/CalibDStUpPi_DsK.root"
-    configdict["fileCalibPionDown"]  = "/afs/cern.ch/work/a/adudziak/public/workspace/CalibDStDownPi_DsK.root"
-    configdict["workCalibPion"]  = "RSDStCalib"
-    configdict["fileCalibKaonUp"]  = "/afs/cern.ch/work/a/adudziak/public/workspace/CalibDStUpK_DsK.root"
-    configdict["fileCalibKaonDown"]  = "/afs/cern.ch/work/a/adudziak/public/workspace/CalibDStDownK_DsK.root"
-    configdict["workCalibKaon"]  = "RSDStCalib"
-    configdict["fileCalibProtonUp"]  = "/afs/cern.ch/work/a/adudziak/public/workspace/work_lblcpi_up_sw.root"
-    configdict["fileCalibProtonDown"]  = "/afs/cern.ch/work/a/adudziak/public/workspace/work_lblcpi_down_sw.root"
-    configdict["workCalibProton"]  = "workspace"
-    configdict["pathFileLcPi"]  = "/afs/cern.ch/work/a/adudziak/public/workspace/sWeights_LbLcPi_both_PIDK10.root"
-    configdict["treeNameLcPi"] = "merged"
-                                           
-    configdict["lumRatioDown"] =  0.59
-    configdict["lumRatioUp"] =  0.44
-    configdict["lumRatio"] =  old_div(configdict["lumRatioUp"],(configdict["lumRatioDown"]+configdict["lumRatioUp"]))
-    
-    # 1: NonRes, 2: PhiPi, 3: KstK, 4: KPiPi, 5: PiPiPi
-    configdict["mean"]    = [5367.51, 5367.51, 5367.51, 5367.51, 5367.51]
-
-    configdict["sigma1_bc"]  = [1.0717e+01,  1.1235e+01,  1.0772e+01,  1.1268e+01,  1.1391e+01 ]
-    configdict["sigma2_bc"]  = [1.6005e+01,  1.7031e+01,  1.5339e+01,  1.9408e+01,  1.7647e+01 ]
-    configdict["alpha1_bc"]  = [2.2118e+00,  2.2144e+00,  2.0480e+00,  2.3954e+00,  2.0930e+00 ]
-    configdict["alpha2_bc"]  = [-2.4185e+00, -2.1918e+00, -2.0291e+00, -3.4196e+00, -2.3295e+00]
-    configdict["n1_bc"]      = [1.0019e+00,  1.1193e+00,  1.2137e+00,  9.8202e-01,  1.2674e+00 ]
-    configdict["n2_bc"]      = [3.1469e+00,  3.6097e+00,  6.5735e+00,  5.2237e-01,  4.0195e+00 ]
-    configdict["frac_bc"]    = [6.1755e-01,  7.0166e-01,  5.8012e-01,  7.8103e-01,  7.0398e-01 ]
-
-    configdict["sigma1Bsfrac"] = 1.22 
-    configdict["sigma2Bsfrac"] = 1.28
-    configdict["alpha1Bsfrac"] = 1.0 
-    configdict["alpha2Bsfrac"] = 1.0 
-    
-    configdict["ratio1"]  = 0.998944636665
-    configdict["ratio2"]  = 1.00022181515
-
-    configdict["meanDs"]    = [1968.49, 1968.49, 1968.49, 1968.49, 1968.49]
-    
-    configdict["sigma1Ds_bc"]  = [5.3468e+00,  8.2412e+00,  6.0845e+00,  8.8531e+00,  8.0860e+00 ]
-    configdict["sigma2Ds_bc"]  = [5.1848e+00,  4.4944e+00,  5.1266e+00,  5.2073e+00,  7.3773e+00 ]
-    configdict["alpha1Ds_bc"]  = [1.2252e+00,  1.9827e+00,  1.1316e+00,  1.7131e+00,  9.0639e-01 ]
-    configdict["alpha2Ds_bc"]  = [-1.1167e+00, -3.0525e+00, -1.3760e+00, -2.5276e+00, -1.1122e+00]
-    configdict["n1Ds_bc"]      = [4.6625e+00,  1.4867e+00,  1.3280e+01,  2.0239e+00,  1.1486e+01 ]
-    configdict["n2Ds_bc"]      = [6.9989e+01,  6.1022e-01,  1.1017e+01,  1.0860e+00,  4.0001e+01 ]
-    configdict["fracDs_bc"]    = [4.7565e-01,  3.9628e-01 , 4.0048e-01,  5.5084e-01,  4.8729e-01 ]
-
-
-    configdict["sigma1Dsfrac"] = 1.16 
-    configdict["sigma2Dsfrac"] = 1.19 
-    configdict["alpha1Dsfrac"] = 1.0 
-    configdict["alpha2Dsfrac"] = 1.0 
-        
-    configdict["cB"] = [-3.2717e-03, -2.0784e-03, -3.0429e-03, -1.5052e-03, -2.2054e-03]
-    configdict["cD"] = [-2.7157e-03, -2.4707e-03, -5.1842e-03, -3.3044e-04, -3.7356e-03]
-    configdict["fracComb"] = [9.4614e-01, 5.3355e-01, 7.7153e-01,  1.0, 1.0]
-            
-    configdict["nBs2DsDsstPiRhoEvts"]  = [180.0, 208.0, 191.0, 37.0, 98.0]
-    configdict["nBs2DsPiEvts"]         = [180.0, 208.0, 191.0, 37.0, 98.0]
-    configdict["nLbDspEvts"]           = [125.0, 125.0, 125.0, 20.0, 40.0]
-    configdict["nLbLcKEvts"]           = [15.0, 2.0,  4.0,  0.0,  0.0]
-    configdict["nLbLcPiEvts"]          = [11.0, 1.0,  3.0,  0.0,  0.0]
-    configdict["nBdDKEvts"]            = [17.0, 0.0,  5.0 , 0.0,  0.0]
-    configdict["nBdDPiEvts"]           = [14.0, 0.0,  3.0,  3.0,  0.0]               
-    
-    configdict["g2_f1"] = 0.42761287
-    configdict["g2_f2"] = 0.47275694
-    configdict["g2_f3"] = 0.05205979
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsKConfigForNominalMassFit.py b/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsKConfigForNominalMassFit.py
deleted file mode 100644
index 28a5e43dfa9db2e077fc30eeb5420720b2393444..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsKConfigForNominalMassFit.py
+++ /dev/null
@@ -1,186 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bs2DsK"
-    configdict["CharmModes"] = {"NonRes","PhiPi","KstK","KPiPi","PiPiPi"} 
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2011"} 
-    # stripping (necessary in case of PIDK shapes)
-    configdict["Stripping"] = {"2011":"17"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes) 
-    configdict["IntegratedLuminosity"] = {"2011": {"Down": 0.59, "Up": 0.44}}
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "../data/Bs2DsK_DsK1fbPAPER/config_Bs2Dsh2011TDAna_Bs2DsK.txt"
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [1.61,    5.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.3,     1.0     ], "InputName" : "BDTGResponse_1"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3834, "p1": 0.9720, "average": 0.3813}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4244, "p1": 1.2180, "average": 0.4097}
-
-    # additional cuts applied to data sets
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0",            "MC" : "lab2_TAU>0&&lab1_M>200", "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                     
-    # order of particles: KKPi, KPiPi, PiPiPi                                
-    configdict["DsChildrenPrefix"] = {"Child1":"lab5","Child2":"lab4","Child3": "lab3"}
-
-    # additional variables in data sets 
-    configdict["AdditionalVariables"] = {}
-    configdict["AdditionalVariables"]["tagOmegaSSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_SS_Kaon_PROB"}
-    configdict["AdditionalVariables"]["tagDecSSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_SS_Kaon_DEC"}
-    configdict["AdditionalVariables"]["tagOmegaOSMuon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Muon_PROB"}
-    configdict["AdditionalVariables"]["tagDecOSMuon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Muon_DEC"}
-    configdict["AdditionalVariables"]["tagOmegaOSElectron"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Electron_PROB"}
-    configdict["AdditionalVariables"]["tagDecSSElectron"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Electron_DEC"}
-    configdict["AdditionalVariables"]["tagOmegaOSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Kaon_PROB"}
-    configdict["AdditionalVariables"]["tagDecOSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Kaon_DEC"}
-    configdict["AdditionalVariables"]["tagOmegaOSnnetKaon"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_nnetKaon_PROB"}
-    configdict["AdditionalVariables"]["tagDecOSnnetKaon"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_nnetKaon_DEC"}
-    configdict["AdditionalVariables"]["tagOmegaOSVtxCharge"] =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_VtxCharge_PROB"}
-    configdict["AdditionalVariables"]["tagDecOSVtxCharge"]   =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_VtxCharge_DEC" }
-
-    #weighting templates by PID eff/misID
-    configdict["WeightingMassTemplates"]= { "Variables":["lab4_P","lab5_P"], "PIDBach": 5, "PIDChild": 0, "PIDProton": 5, "RatioDataMC":True }
-    
-    #weighting for PID templates
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[20,20] }
-
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID5_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID5_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID5_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID5_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]   = {}
-    configdict["Calibrations"]["2011"]["Proton"]["Up"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/work_lblcpi_up_sw.root",
-                                                           "WorkName":"workspace", "Type":"Special", "DataName":"ProtonsSample_up",
-                                                           "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Proton"]["Down"] = { "FileName": "/afs/cern.ch/work/a/adudziak/public/workspace/work_lblcpi_down_sw.root",
-                                                             "WorkName":"workspace", "Type":"Special", "DataName":"ProtonsSample_down",
-                                                             "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/work_Comb_Up_DsK_5358.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/work_Comb_Down_DsK_5358.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-    # Bs signal shapes                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBall"
-    configdict["BsSignalShape"]["mean"]    = {"All":5367.51}
-    configdict["BsSignalShape"]["sigma1"]  = {"2011": {"NonRes":1.0717e+01,  "PhiPi":1.1235e+01,  "KstK":1.0772e+01,  "KPiPi":1.1268e+01,  "PiPiPi":1.1391e+01}, "Fixed":True}
-    configdict["BsSignalShape"]["sigma2"]  = {"2011": {"NonRes":1.6005e+01,  "PhiPi":1.7031e+01,  "KstK":1.5339e+01,  "KPiPi":1.9408e+01,  "PiPiPi":1.7647e+01}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha1"]  = {"2011": {"NonRes":2.2118e+00,  "PhiPi":2.2144e+00,  "KstK":2.0480e+00,  "KPiPi":2.3954e+00,  "PiPiPi":2.0930e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha2"]  = {"2011": {"NonRes":-2.4185e+00, "PhiPi":-2.1918e+00, "KstK":-2.0291e+00, "KPiPi":-3.4196e+00, "PiPiPi":-2.3295e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["n1"]      = {"2011": {"NonRes":1.0019e+00,  "PhiPi":1.1193e+00,  "KstK":1.2137e+00,  "KPiPi":9.8202e-01,  "PiPiPi":1.2674e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"2011": {"NonRes":3.1469e+00,  "PhiPi":3.6097e+00,  "KstK":6.5735e+00,  "KPiPi":5.2237e-01,  "PiPiPi":4.0195e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["frac"]    = {"2011": {"NonRes":6.1755e-01,  "PhiPi":7.0166e-01,  "KstK":5.8012e-01,  "KPiPi":7.8103e-01,  "PiPiPi":7.0398e-01}, "Fixed":True}
-    configdict["BsSignalShape"]["scaleSigma"] = { "2011": {"frac1": 1.22, "frac2":1.28}}
-
-    #Ds signal shapes                                                                                                
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBall"
-    configdict["DsSignalShape"]["mean"]    = {"All":1968.49}
-    configdict["DsSignalShape"]["sigma1"]  = {"2011": {"NonRes":5.3468e+00,  "PhiPi":8.2412e+00,  "KstK":6.0845e+00,  "KPiPi":8.8531e+00,  "PiPiPi":8.0860e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["sigma2"]  = {"2011": {"NonRes":5.1848e+00,  "PhiPi":4.4944e+00,  "KstK":5.1266e+00,  "KPiPi":5.2073e+00,  "PiPiPi":7.3773e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha1"]  = {"2011": {"NonRes":1.2252e+00,  "PhiPi":1.9827e+00,  "KstK":1.1316e+00,  "KPiPi":1.7131e+00,  "PiPiPi":9.0639e-01}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha2"]  = {"2011": {"NonRes":-1.1167e+00, "PhiPi":-3.0525e+00, "KstK":-1.3760e+00, "KPiPi":-2.5276e+00, "PiPiPi":-1.1122e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["n1"]      = {"2011": {"NonRes":4.6625e+00,  "PhiPi":1.4867e+00,  "KstK":1.3280e+01,  "KPiPi":2.0239e+00,  "PiPiPi":1.1486e+01}, "Fixed":True}
-    configdict["DsSignalShape"]["n2"]      = {"2011": {"NonRes":6.9989e+01,  "PhiPi":6.1022e-01,  "KstK":1.1017e+01,  "KPiPi":1.0860e+00,  "PiPiPi":4.0001e+01}, "Fixed":True}
-    configdict["DsSignalShape"]["frac"]    = {"2011": {"NonRes":4.7565e-01,  "PhiPi":3.9628e-01,  "KstK":4.0048e-01,  "KPiPi":5.5084e-01,  "PiPiPi":4.8729e-01}, "Fixed":True}
-    configdict["DsSignalShape"]["scaleSigma"] = { "2011": {"frac1": 1.16, "frac2":1.19}}
- 
-    # combinatorial background                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"] = "Exponential"
-    configdict["BsCombinatorialShape"]["cB"]   = {"2011":{"NonRes":-1.1530e-03,  "PhiPi":-9.2354e-04,  "KstK":-1.3675e-03, "KPiPi":-9.8158e-04, "PiPiPi":-1.0890e-03}, "Fixed":False}
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal"
-    configdict["DsCombinatorialShape"]["cD"]         = {"2011": {"NonRes":-4.4329e-03,  "PhiPi":-8.8642e-03,  "KstK":-5.2652e-03, "KPiPi":-1.0743e-03, "PiPiPi":-1.1877e-03}, "Fixed":False}
-    configdict["DsCombinatorialShape"]["fracCombD"]   = {"2011": {"NonRes":4.3067e-01,   "PhiPi":6.5400e-01,   "KstK":3.7409e-01,  "KPiPi":1.0,         "PiPiPi":1.0},         
-                                                        "Fixed":{"KPiPi":True, "PiPiPi":True}}
-
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":True }
-    configdict["PIDKCombinatorialShape"]["fracPIDK"]   = { "2011":{"fracPIDK1":0.5, "fracPIDK2":0.5}, "Fixed":False }
-
-    #Bd2Dsh background                                                                                           
-    #shape for BeautyMass, for CharmMass as well as BacPIDK taken by default the same as signal                                                                
-    configdict["Bd2Ds(st)XShape"] = {}
-    configdict["Bd2Ds(st)XShape"]["type"]    = "ShiftedSignal"
-    configdict["Bd2Ds(st)XShape"]["name"]    = "Bd2DsK"
-    configdict["Bd2Ds(st)XShape"]["scaleSigma"] = { "2011": {"frac1": 0.998944636665, "frac2":1.00022181515}}
-
-    #                                                                                                                                                                                 
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = { "CentralValue":1.0, "Range":[0.0,1.0], "Fixed":True}
-    configdict["AdditionalParameters"]["g2_f1_frac"] = { "CentralValue":0.5, "Range":[0.0,1.0], "Fixed":False}
-    configdict["AdditionalParameters"]["g2_f2_frac"] = { "CentralValue":0.5, "Range":[0.0,1.0], "Fixed":True}
-    configdict["AdditionalParameters"]["g3_f1_frac"] = { "CentralValue":0.75,"Range":[0.0,1.0], "Fixed":True}
-    configdict["AdditionalParameters"]["g5_f1_frac"] = { "CentralValue":0.5, "Range":[0.0,1.0], "Fixed":False}
-
-    #expected yields                                                                                                                                                              
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bd2DPi"]             = {"2011": {"NonRes":14.0,    "PhiPi":0.0,    "KstK":3.0,    "KPiPi":3.0,    "PiPiPi":0.0},      "Fixed":True}
-    configdict["Yields"]["Bd2DK"]              = {"2011": {"NonRes":17.0,    "PhiPi":0.0,    "KstK":5.0,    "KPiPi":0.0,    "PiPiPi":0.0},      "Fixed":True}
-    configdict["Yields"]["Lb2LcPi"]            = {"2011": {"NonRes":11.0,    "PhiPi":1.0,    "KstK":3.0,    "KPiPi":0.0,    "PiPiPi":0.0},      "Fixed":True}
-    configdict["Yields"]["Lb2LcK"]             = {"2011": {"NonRes":15.0,    "PhiPi":2.0,    "KstK":4.0,    "KPiPi":0.0,    "PiPiPi":0.0},      "Fixed":True}
-    configdict["Yields"]["Bs2DsDsstKKst"]      = {"2011": {"NonRes":50.0,    "PhiPi":50.0,   "KstK":50.0,   "KPiPi":50.0,   "PiPiPi":50.0},     "Fixed":False}
-    configdict["Yields"]["BsLb2DsDsstPPiRho"]  = {"2011": {"NonRes":225.0,   "PhiPi":500.0,  "KstK":330.0,  "KPiPi":90.0,   "PiPiPi":260.0},    "Fixed":False}
-    configdict["Yields"]["CombBkg"]            = {"2011": {"NonRes":1000.0,  "PhiPi":1000.0, "KstK":1000.0, "KPiPi":1000.0, "PiPiPi":10000.0},  "Fixed":False}
-    configdict["Yields"]["Signal"]             = {"2011": {"NonRes":1000.0,  "PhiPi":1000.0, "KstK":1000.0, "KPiPi":1000.0, "PiPiPi":10000.0} , "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#            
-    ###                                                               MDfit plotting settings                                                                                 
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------# 
- 
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = { "EPDF": ["Sig", "CombBkg", "Lb2LcK", "Lb2LcPi", "Bd2DK", "Bd2DPi","BsLb2DsDsstPPiRho", "Bs2DsDsstKKst"],
-                                                 "PDF":  ["Sig", "CombBkg", "Lb2LcK", "Lb2LcPi", "Lb2DsDsstP", "Bs2DsDsstPiRho", "Bd2DK", "Bd2DPi","Bs2DsDsstKKst"],
-                                                 "Legend": ["Sig", "CombBkg", "Lb2LcKPi", "Lb2DsDsstP", "Bs2DsDsstPiRho", "Bd2DKPi","Bs2DsDsstKKst"]}
-    configdict["PlotSettings"]["colors"] = { "PDF": [kRed-7, kMagenta-2, kGreen-3, kGreen-3, kYellow-9, kBlue-6, kRed, kRed, kBlue-10],
-                                             "Legend": [kRed-7, kMagenta-2, kGreen-3, kYellow-9, kBlue-6, kRed, kBlue-10]}
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66], 
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsPi/Bs2DsPiConfigForGenerator5M.py b/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsPi/Bs2DsPiConfigForGenerator5M.py
deleted file mode 100644
index 62e3e339a65e0045be2fda6881770c44f85ece6f..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsPi/Bs2DsPiConfigForGenerator5M.py
+++ /dev/null
@@ -1,152 +0,0 @@
-from __future__ import division
-from past.utils import old_div
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]      =  0.661   # in ps^{-1}
-    configdict["DeltaGammas"] = -0.105
-
-    configdict["Gammad"]      =  0.656   # in ps^{-1}
-    configdict["DeltaGammad"] =  0.
-
-    configdict["DeltaMs"]     =  17.768    # in ps^{-1}
-    configdict["DeltaMd"]     =  0.507   # in ps^{-1}
-
-    configdict["GammaLb"]    =  0.700    # in ps^{-1}
-    configdict["GammaCombo"] =  0.800
-       
-    configdict["StrongPhase_d"] = 20. / 180. * pi
-    configdict["StrongPhase_s"] = 30. / 180. * pi
-    configdict["WeakPhase"]     = 70. / 180. * pi
-
-    configdict["ArgLf_d"]       = configdict["StrongPhase_d"] - configdict["WeakPhase"]
-    configdict["ArgLbarfbar_d"] = configdict["StrongPhase_d"] + configdict["WeakPhase"]
-    configdict["ModLf_d"]       = 0.015
-    
-    configdict["ArgLf_s"]       = configdict["StrongPhase_s"] - configdict["WeakPhase"]
-    configdict["ArgLbarfbar_s"] = configdict["StrongPhase_s"] + configdict["WeakPhase"]
-    configdict["ModLf_s"]       = 0.372
-
-    configdict["calibration_p0"]  = [0.3927, 0.4244]
-    configdict["calibration_p1"]  = [0.9818, 1.2550]
-    configdict["calibration_av"]  = [0.3919, 0.4097]
-       
-    configdict["resolutionScaleFactor"] = 1.37
-    configdict["resolutionMeanBias"]    = 0.0
-    
-    configdict["nBinsMistag"]   = 50
-    configdict["nBinsProperTimeErr"]   = 50
-    configdict["nBinsAcceptance"]   = 740
-    
-    configdict["lumRatioDown"] =  0.59
-    configdict["lumRatioUp"] =  0.44
-    configdict["lumRatio"] =  old_div(configdict["lumRatioUp"],(configdict["lumRatioDown"]+configdict["lumRatioUp"]))
-            
-    configdict["timeRange"] = [0.2, 15]
-
-    configdict["tacc_size"]   = 6
-    configdict["tacc_knots"]  = [0.25, 0.5, 1.0, 2.0, 3.0, 12.0]
-    configdict["tacc_values"] = [1.77520e-01, 2.89603e-01, 6.79455e-01, 1.11726e+00, 1.23189e+00, 1.26661e+00] 
-
-    configdict["tagEff_OS"] = 0.387
-    configdict["tagEff_SS"] = 0.4772
-
-    configdict["tagEff_signal"]    = [configdict["tagEff_OS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_SS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_OS"]*configdict["tagEff_SS"]]
-    configdict["tagEff_dpi"]       = [configdict["tagEff_OS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_SS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_OS"]*configdict["tagEff_SS"]]
-    configdict["tagEff_dsk"]       = [configdict["tagEff_OS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_SS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_OS"]*configdict["tagEff_SS"]]
-    configdict["tagEff_dspi"]      = [configdict["tagEff_OS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_SS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_OS"]*configdict["tagEff_SS"]]
-    configdict["tagEff_lcpi"]      = [configdict["tagEff_OS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_SS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_OS"]*configdict["tagEff_SS"]]
-    configdict["tagEff_combo"]     = [configdict["tagEff_OS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_SS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_OS"]*configdict["tagEff_SS"]]
-    configdict["tagEff_dsstpi"]    = [configdict["tagEff_OS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_SS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_OS"]*configdict["tagEff_SS"]]
-    configdict["tagEff_dsrho"]     = [configdict["tagEff_OS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_SS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                      configdict["tagEff_OS"]*configdict["tagEff_SS"]]
-    
-
-    configdict["aprod_signal"]    = 0.0 #0.0
-    configdict["aprod_dpi"]       = 0.0 #0.0 
-    configdict["aprod_dsk"]       = 0.0 #3
-    configdict["aprod_dspi"]      = 0.0 # 3
-    configdict["aprod_lcpi"]      = 0.0 # 3
-    configdict["aprod_combo"]     = 0.0 #3
-    configdict["aprod_dsstpi"]    = 0.0 #3
-    configdict["aprod_dsrho"]     = 0.0 #3
-                                    
-    configdict["atageff_signal"]    = [0.0, 0.0, 0.0]
-    configdict["atageff_dpi"]       = [0.0, 0.0, 0.0]
-    configdict["atageff_dsk"]       = [0.0, 0.0, 0.0]
-    configdict["atageff_dspi"]      = [0.0, 0.0, 0.0]
-    configdict["atageff_lcpi"]      = [0.0, 0.0, 0.0]
-    configdict["atageff_combo"]     = [0.0, 0.0, 0.0]
-    configdict["atageff_dsstpi"]    = [0.0, 0.0, 0.0]
-    configdict["atageff_dsrho"]     = [0.0, 0.0, 0.0]
-
-    configdict["adet_signal"]    = 0.0
-    configdict["adet_dpi"]       = 0.0
-    configdict["adet_dsk"]       = 0.0
-    configdict["adet_dspi"]      = 0.0
-    configdict["adet_lcpi"]      = 0.0
-    configdict["adet_combo"]     = 0.0
-    configdict["adet_dsstpi"]    = 0.0
-    configdict["adet_dsrho"]     = 0.0
-    
-    configdict["num_signal"]    = [4884, 10783, 7585, 1702, 4473]
-    configdict["num_dpi"]       = [374,  6,     93,   30,   0   ]
-    configdict["num_dsk"]       = [40,   47,    40,   8,    21  ]
-    configdict["num_dspi"]      = [77*0.5,   96*0.5,  84*0.5,   25*0.5,   41*0.5]
-    configdict["num_lcpi"]      = [290,  36,    69,   1,    0   ]
-    configdict["num_combo"]     = [3188, 1537,  1403, 1617, 4493]
-    configdict["num_dsstpi"]    = [77*0.5,   96*0.5,  84*0.5,   25*0.5,   41*0.5]
-    configdict["num_dsrho"]     = [0.0,  0.0,   0.0,  0.0,  0.0 ]
-
-    #----------------------------Signal----------------------------#
-
-    configdict["mean"]    = [5367.51, 5367.51, 5367.51, 5367.51, 5367.51]
-    configdict["sigma1"]  = [1.1538e+01*1.28,  1.6598e+01*1.22,  1.1646e+01*1.28,  1.1428e+01*1.28,  1.1989e+01*1.28]                            
-    configdict["sigma2"]  = [1.6181e+01*1.22,  1.1488e+01*1.28,  1.4992e+01*1.22,  1.6866e+01*1.22,  1.7588e+01*1.22]                                    
-    configdict["alpha1"]  = [1.9050e+00,  -2.0856e+00, 1.7019e+00,  1.9066e+00,  1.8497e+00 ]                                                     
-    configdict["alpha2"]  = [-2.0423e+00, 1.8947e+00,  -1.8418e+00, -2.2615e+00, -2.0560e+00]                                                     
-    configdict["n1"]      = [1.1327e+00,  5.2735e+00,  1.2686e+00,  1.1585e+00,  1.2326e+00]
-    configdict["n2"]      = [6.1273e+00,  1.1497e+00,  9.6571e+00,  4.1167e+00,  7.8246e+00]
-    configdict["frac"]    = [5.5417e-01,  4.4171e-01,  4.6731e-01,  5.9179e-01,  6.2376e-01]
-
-    configdict["ratio1"]  = 0.998944636665
-    configdict["ratio2"]  = 1.00022181515
-
-    configdict["meanDs"]    = [1968.49, 1968.49, 1968.49, 1968.49, 1968.49]
-    configdict["sigma1Ds"]  = [4.3930e+00*1.19,  8.7215e+00*1.16,  7.8768e+00*1.16,  6.7734e+00*1.16,  8.4187e+00*1.16 ]   
-    configdict["sigma2Ds"]  = [7.1493e+00*1.16,  4.6238e+00*1.19,  4.5946e+00*1.19,  6.4937e+00*1.19,  7.2604e+00*1.19 ]   
-    configdict["alpha1Ds"]  = [2.1989e+00,  1.7979e+00,  1.9708e+00,  9.1754e-01,  9.4869e-01 ]                       
-    configdict["alpha2Ds"]  = [-2.0186e+00, -3.2123e+00, -2.7746e+00, -1.2753e+00, -1.0429e+00]                                                    
-    configdict["n1Ds"]      = [7.9389e-01,  2.6693e+00,  2.0849e+00,  9.2763e+00,  1.2886e+01 ]
-    configdict["n2Ds"]      = [5.5608e+00,  4.4751e-01,  1.0774e+00,  4.6466e+01,  6.9998e+01 ]
-    configdict["fracDs"]    = [0.25406,     3.5389e-01,  4.5702e-01,  3.5803e-01,  4.9901e-01 ]
-           
-    configdict["cB1"] = [-6.2895e-03, -9.3775e-03, -7.9542e-03, -7.1989e-03, -4.8664e-03]
-    configdict["cB2"] = [0.0, 0.0, 0.0, 0.0, 0.0]
-    configdict["fracBsComb"] = [7.8065e-01, 6.4053e-01, 7.7315e-01, 4.0456e-01, 5.1449e-01]
-
-    configdict["cD"] = [-4.2766e-03, -2.0470e-03, -4.4298e-03, -4.9326e-03, -2.1470e-03]
-    configdict["fracDsComb"] = [9.5698e-01, 5.9161e-01, 8.2227e-01,  1.0, 1.0]
-
-    configdict["fracPIDKComb"] = 8.9331e-01
-       
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalDMSFitSplinesFloatAcc.py b/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalDMSFitSplinesFloatAcc.py
deleted file mode 100644
index 414cff084a5bf3eca87359f0e1d623b620959b8e..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalDMSFitSplinesFloatAcc.py
+++ /dev/null
@@ -1,116 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]        =  0.661   # in ps^{-1}
-    configdict["DeltaGammas"]   =  -0.105
-    configdict["DeltaMs"]       = 17.768   # in ps^{-1}
-    configdict["TagEffSig"]     = 0.403
-    configdict["TagOmegaSig"]   = 0.391
-    configdict["StrongPhase"]   = 20. / 180. * pi
-    configdict["WeakPhase"]     = 70./180.*pi
-    configdict["ArgLf"]         = configdict["StrongPhase"] - configdict["WeakPhase"]
-    configdict["ArgLbarfbar"]   = configdict["StrongPhase"] + configdict["WeakPhase"]
-    configdict["ModLf"]         = 0.372
-
-    configdict["tacc_size"]   = 6
-    configdict["tacc_knots"]  = [0.50, 1.0,  1.5, 2.0, 3.0, 12.0]            
-    configdict["tacc_values"] = [4.5579e-01,7.0310e-01,8.7709e-01,1.1351e+00,1.2233e+00,1.2323e+00]
-
-    configdict["calibration_p0"]  = [0.3834, 0.4244]
-    configdict["calibration_p1"]  = [0.9720, 1.2180]
-    configdict["calibration_av"]  = [0.3813, 0.4097]
-
-    configdict["constr_p0_B"] = [0.365517, 0.424801, 0.338781]
-    configdict["constr_p1_B"] = [0.950216, 1.004340, 0.971845]
-    configdict["constr_av_B"] = [0.371147, 0.414892, 0.338493]
-
-    configdict["constr_p0_Bbar"] = [0.376730, 0.404896, 0.338363]
-    configdict["constr_p1_Bbar"] = [1.048155, 0.995879, 1.027861]
-    configdict["constr_av_Bbar"] = [0.371147, 0.414892, 0.338493]
-
-    configdict["constr_p0_B_err"] = [0.00, 0.00, 0.00]
-    configdict["constr_p1_B_err"] = [0.00, 0.00, 0.00]
-    configdict["constr_p0_Bbar_err"] = [0.00, 0.00, 0.00]
-    configdict["constr_p1_Bbar_err"] = [0.00, 0.00, 0.00]
-           
-    configdict["tagEff_OS"] = 0.387
-    configdict["tagEff_SS"] = 0.4772
-
-    configdict["adet"] = 0.01
-    
-    configdict["TagEffSig"]    = [configdict["tagEff_OS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                  configdict["tagEff_SS"] - configdict["tagEff_OS"]*configdict["tagEff_SS"],
-                                  configdict["tagEff_OS"]*configdict["tagEff_SS"]]
-    
-    configdict["aTagEffSig"]    = [-0.002756, 0.001837, -0.002315]
-       
-    configdict["resolutionScaleFactor"] = 1.37 
-    configdict["resolutionMeanBias"]    = 0.0
-    
-    configdict["resolutionSigma1"] = 2.14946e-02
-    configdict["resolutionSigma2"] = 3.67643e-02
-    configdict["resolutionSigma3"] = 6.32869e-02
-    configdict["resolutionFrac1"]  = 3.72147e-01
-    configdict["resolutionFrac2"]  = 5.65150e-01
-
-    configdict["MistagFile"]     = "../data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root"
-    configdict["MistagWork"]     = "workspace"
-    configdict["MistagTempName"] = ["sigMistagPdf_1", "sigMistagPdf_2", "sigMistagPdf_3"]
-        
-    configdict["TerrFile"]     = "../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root"
-    configdict["TerrWork"]     = "workspace"
-    configdict["TerrTempName"] = "TimeErrorPdf_Bs2DsPi"
-
-
-    configdict["Constrains"] = {
-        # multivariate Gaussian constraint for tagging calibration parameters                                                                                                                       
-        'multivar_Bs2DsKMistagCalib_p0p1': [
-            # variable names                                                                                                                                                                        
-            [   'p0_B_0', 'p1_B_0', #B                                                                                                                                                              
-                'p0_B_1', 'p1_B_1', #B                                                                                                                                                              
-                'p0_B_2', 'p1_B_2', #B                                                                                                                                                              
-                'p0_Bbar_0', 'p1_Bbar_0', #Bbar                                                                                                                                                     
-                'p0_Bbar_1', 'p1_Bbar_1', #Bbar                                                                                                                                                     
-                'p0_Bbar_2', 'p1_Bbar_2', ], #Bbar                                                                                                                                                  
-            # errors                                                                                                                                                                                
-            [   0.004389, 0.039917, 0.007146, 0.148797, 0.005959, 0.038725,
-                0.004395, 0.040072, 0.011414, 0.150355, 0.006030, 0.039962, ],
-            # correlation matrix                                                                                                                                                                    
-            [   [  1.000000000, -0.111790756,  0.000000000,  0.000000000,  0.495659195, -0.121263673,  0.883403568, -0.090341177,  0.000000000,  0.000000000,  0.436308995, -0.115934567 ],
-                [ -0.111790756,  1.000000000,  0.000000000,  0.000000000, -0.170723691,  0.368653977, -0.090433543,  0.808300854,  0.000000000,  0.000000000, -0.138612127,  0.303210400 ],
-                [  0.000000000,  0.000000000,  1.000000000, -0.122610568,  0.658158523, -0.541239353,  0.000000000,  0.000000000,  0.938782519, -0.120298908,  0.633382320, -0.525375965 ],
-                [  0.000000000,  0.000000000, -0.122610568,  1.000000000, -0.631056425,  0.811985505,  0.000000000,  0.000000000, -0.122445304,  0.986409445, -0.608419498,  0.787887823 ],
-                [  0.495659195, -0.170723691,  0.658158523, -0.631056425,  1.000000000, -0.874463407,  0.436823522, -0.137898963,  0.622128000, -0.622176239,  0.940276558, -0.841479510 ],
-                [ -0.121263673,  0.368653977, -0.541239353,  0.811985505, -0.874463407,  1.000000000, -0.104272659,  0.297793832, -0.514032745,  0.800698231, -0.830102616,  0.950602614 ],
-                [  0.883403568, -0.090433543,  0.000000000,  0.000000000,  0.436823522, -0.104272659,  1.000000000, -0.111883376,  0.000000000,  0.000000000,  0.494752953, -0.134191009 ],
-                [ -0.090341177,  0.808300854,  0.000000000,  0.000000000, -0.137898963,  0.297793832, -0.111883376,  1.000000000,  0.000000000,  0.000000000, -0.170921923,  0.374807565 ],
-                [  0.000000000,  0.000000000,  0.938782519, -0.122445304,  0.622128000, -0.514032745,  0.000000000,  0.000000000,  1.000000000, -0.123454584,  0.672735926, -0.556618676 ],
-                [  0.000000000,  0.000000000, -0.120298908,  0.986409445, -0.622176239,  0.800698231,  0.000000000,  0.000000000, -0.123454584,  1.000000000, -0.616497607,  0.798523473 ],
-                [  0.436308995, -0.138612127,  0.633382320, -0.608419498,  0.940276558, -0.830102616,  0.494752953, -0.170921923,  0.672735926, -0.616497607,  1.000000000, -0.878334170 ],
-                [ -0.115934567,  0.303210400, -0.525375965,  0.787887823, -0.841479510,  0.950602614, -0.134191009,  0.374807565, -0.556618676,  0.798523473, -0.878334170,  1.000000000 ], ],
-            ],
-        'multivar_Bs2DsKTagEffAsyms': [
-            [   'tagEffSig_1', 'tagEffSig_2', 'tagEffSig_3',
-                 'aTagEff_1', 'aTagEff_2', 'aTagEff_3' ],
-            [   0.001952, 0.002330, 0.001843, 0.001628, 0.001029, 0.001629 ],
-            [   [   1.0000000000000000e+00,  -9.6310597862753633e-01,   2.4948159233783404e-01,   1.0144953478135443e-02,   7.0203224420703663e-03,   1.0233976427853671e-02 ],
-                [  -9.6310597862753633e-01,   1.0000000000000000e+00,   2.0335415458912924e-02,  -8.0556554583657968e-03,  -5.7778847902391142e-03,  -8.1729979402554217e-03 ],
-                [   2.4948159233783404e-01,   2.0335415458912924e-02,   1.0000000000000000e+00,   8.9803482925014111e-03,   5.0106145332872738e-03,   8.8849526862593686e-03 ],
-                [   1.0144953478135443e-02,  -8.0556554583657968e-03,   8.9803482925014111e-03,   1.0000000000000000e+00,  -9.9965299841531974e-01,   9.9878828433569355e-01 ],
-                [   7.0203224420703663e-03,  -5.7778847902391142e-03,   5.0106145332872738e-03,  -9.9965299841531974e-01,   1.0000000000000000e+00,  -9.9759036187377381e-01 ],
-                [   1.0233976427853671e-02,  -8.1729979402554217e-03,   8.8849526862593686e-03,   9.9878828433569355e-01,  -9.9759036187377381e-01,   1.0000000000000000e+00 ], ],
-            ],
-        }
-
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas')
-    configdict["constParams"].append('deltaGammas')
-    configdict["constParams"].append('tagEffSig')
-    #configdict["constParams"].append('DeltaMs')
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalDMSFitToys1M.py b/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalDMSFitToys1M.py
deleted file mode 100644
index d285dcb85141689659a2f8a085b1597b7b6d6045..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalDMSFitToys1M.py
+++ /dev/null
@@ -1,68 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]        = 0.661   # in ps^{-1}
-    configdict["DeltaGammas"]   = -0.105
-    configdict["DeltaMs"]       = 17.6   # in ps^{-1}
-    configdict["TagEffSig"]     = 0.403
-    configdict["TagOmegaSig"]   = 0.391
-    configdict["StrongPhase"]   = 30. / 180. * pi
-    configdict["WeakPhase"]     = 70./180.*pi 
-    configdict["ArgLf"]         = configdict["StrongPhase"] - configdict["WeakPhase"]
-    configdict["ArgLbarfbar"]   = configdict["StrongPhase"] + configdict["WeakPhase"]
-    configdict["ModLf"]         = 0.372
-
-    configdict["tacc_exponent"] = 1.8627e+00 #1.849
-    configdict["tacc_offset"]   = 1.6710e-02 #0.0373
-    configdict["tacc_beta"]     = 3.4938e-02 #0.0363
-    configdict["tacc_turnon"]   = 1.3291e+00 #1.215
-                
-    #configdict["tacc_exponent"] = 1.83165e+00
-    #configdict["tacc_offset"]   = 1.94941e-02
-    #configdict["tacc_beta"]     = 3.55134e-02
-    #configdict["tacc_turnon"]   = 1.31231e+00
-                        
-    configdict["resolutionScaleFactor"] = 1.37  
-    configdict["resolutionMeanBias"]    = 0.0
-    configdict["DecayTimeResolutionModel"] = "TripleGaussian"
-    configdict["DecayTimeErrInterpolation"] = True
-
-    configdict["resolutionSigma1"] = 2.14946e-02
-    configdict["resolutionSigma2"] = 3.67643e-02
-    configdict["resolutionSigma3"] = 6.32869e-02
-    configdict["resolutionFrac1"]  = 3.72147e-01
-    configdict["resolutionFrac2"]  = 5.65150e-01
-    
-    configdict["calibration_p1"] = 1.035 #1.035
-    configdict["calibration_p0"] = 0.392 #-0.013
-    
-    configdict["TemplateFile"]            = "/afs/cern.ch/work/a/adudziak/public/workspace/MDFitter/templates_BsDsPi.root"
-    configdict["TemplateWorkspace"]       = "workspace"
-    configdict["MistagTemplateName"]      = "MistagPdf_signal_BDTGA"
-    configdict["MistagVarName"]           = "lab0_BsTaggingTool_TAGOMEGA_OS"
-    
-    configdict["TimeErrorTemplateName"]   = "TimeErrorPdf_signal_BDTGA"
-    
-    configdict["TimeDown"]     = 0.2
-    configdict["TimeUp"]   = 15.0
-
-    configdict["nBinsMistag"]   = 50
-    configdict["nBinsProperTimeErr"]   = 50
-    configdict["nBinsAcceptance"]   = 370    
-               
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas')
-    configdict["constParams"].append('deltaGammas')
-    configdict["constParams"].append('tagEffSig')
-    configdict["constParams"].append('tacc_exponent')
-    configdict["constParams"].append('tacc_offset')
-    configdict["constParams"].append('tacc_beta')
-    configdict["constParams"].append('tacc_turnon')
-    #configdict["constParams"].append('DeltaMs')
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFit.py b/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFit.py
deleted file mode 100644
index 4b1339e9139a5b54968832ee972b686057bd5b46..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFit.py
+++ /dev/null
@@ -1,181 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bs2DsPi"
-    configdict["CharmModes"] = {"NonRes","PhiPi","KstK","KPiPi","PiPiPi"}
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2011"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2011":"17"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                  
-    configdict["IntegratedLuminosity"] = {"2011": {"Down": 0.59, "Up": 0.44}}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/config_Bs2Dsh2011TDAna_Bs2DsPi.txt"
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [0.0,     150.0   ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.3,     1.0     ], "InputName" : "BDTGResponse_1"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration                                                                                               
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3834, "p1": 0.9720, "average": 0.3813}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4244, "p1": 1.2180, "average": 0.4097}
-
-    # additional cuts applied to data sets                                                                                    
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0",            "MC" : "lab2_TAU>0&&lab1_M<200", "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                              
-    # order of particles: KKPi, KPiPi, PiPiPi                                                                                                         
-    configdict["DsChildrenPrefix"] = {"Child1":"lab5","Child2":"lab4","Child3": "lab3"}
-
-    # additional variables in data sets                                                                                                             
-    configdict["AdditionalVariables"] = {}
-    configdict["AdditionalVariables"]["tagOmegaSSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_SS_Kaon_PROB"}
-    configdict["AdditionalVariables"]["tagDecSSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_SS_Kaon_DEC"}
-    configdict["AdditionalVariables"]["tagOmegaOSMuon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Muon_PROB"}
-    configdict["AdditionalVariables"]["tagDecOSMuon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Muon_DEC"}
-    configdict["AdditionalVariables"]["tagOmegaOSElectron"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Electron_PROB"}
-    configdict["AdditionalVariables"]["tagDecSSElectron"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Electron_DEC"}
-    configdict["AdditionalVariables"]["tagOmegaOSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Kaon_PROB"}
-    configdict["AdditionalVariables"]["tagDecOSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Kaon_DEC"}
-    configdict["AdditionalVariables"]["tagOmegaOSnnetKaon"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_nnetKaon_PROB"}
-    configdict["AdditionalVariables"]["tagDecOSnnetKaon"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_nnetKaon_DEC"}
-    configdict["AdditionalVariables"]["tagOmegaOSVtxCharge"] =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_VtxCharge_PROB"}
-    configdict["AdditionalVariables"]["tagDecOSVtxCharge"]   =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_VtxCharge_DEC" }
-
-
-    #weighting templates by PID eff/misID                                                                                                                                                   
-    configdict["WeightingMassTemplates"]= { "Variables":["lab4_P","lab5_P"], "PIDBach": 0, "PIDChild": 0, "PIDProton": 5, "RatioDataMC":True }
-
-    #weighting for PID templates                                                                                                                                                            
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[20,20] }
-    
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID0_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID0_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID0_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID0_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/work_Comb_DsPi_5358.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/work_Comb_DsPi_5358.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes                                                                                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBall"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"2011": {"NonRes":1.1538e+01,  "PhiPi":1.6598e+01,  "KstK":1.1646e+01,  "KPiPi":1.1428e+01,  "PiPiPi":1.1989e+01},  "Fixed":True}
-    configdict["BsSignalShape"]["sigma2"]  = {"2011": {"NonRes":1.6181e+01,  "PhiPi":1.1488e+01,  "KstK":1.4992e+01,  "KPiPi":1.6866e+01,  "PiPiPi":1.7588e+01},  "Fixed":True}
-    configdict["BsSignalShape"]["alpha1"]  = {"2011": {"NonRes":1.9050e+00,  "PhiPi":-2.0856e+00, "KstK":1.7019e+00,  "KPiPi":1.9066e+00,  "PiPiPi":1.8497e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["alpha2"]  = {"2011": {"NonRes":-2.0423e+00, "PhiPi":1.8947e+00,  "KstK":-1.8418e+00, "KPiPi":-2.2615e+00, "PiPiPi":-2.0560e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["n1"]      = {"2011": {"NonRes":1.1327e+00,  "PhiPi":5.2735e+00,  "KstK":1.2686e+00,  "KPiPi":1.1585e+00,  "PiPiPi":1.2326e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"2011": {"NonRes":6.1273e+00,  "PhiPi":1.1497e+00,  "KstK":9.6571e+00,  "KPiPi":4.1167e+00,  "PiPiPi":7.8246e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["frac"]    = {"2011": {"NonRes":5.5417e-01,  "PhiPi":4.4171e-01,  "KstK":4.6731e-01,  "KPiPi":5.9179e-01,  "PiPiPi":6.2376e-01},  "Fixed":True}
-    configdict["BsSignalShape"]["scaleSigma"] = { "2011": {"frac1": 1.22, "frac2":1.28}} 
-
-    #Ds signal shapes                                                                                                                                       
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBall"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma1"]  = {"2011": {"NonRes":4.3930e+00,  "PhiPi":8.7215e+00,  "KstK":7.8768e+00,  "KPiPi":6.7734e+00,  "PiPiPi":8.4187e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["sigma2"]  = {"2011": {"NonRes":7.1493e+00,  "PhiPi":4.6238e+00,  "KstK":4.5946e+00,  "KPiPi":6.4937e+00,  "PiPiPi":7.2604e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha1"]  = {"2011": {"NonRes":2.1989e+00,  "PhiPi":1.7979e+00,  "KstK":1.9708e+00,  "KPiPi":9.1754e-01,  "PiPiPi":9.4869e-01}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha2"]  = {"2011": {"NonRes":-2.0186e+00, "PhiPi":-3.2123e+00, "KstK":-2.7746e+00, "KPiPi":-1.2753e+00, "PiPiPi":-1.0429e+00},"Fixed":True}
-    configdict["DsSignalShape"]["n1"]      = {"2011": {"NonRes":7.9389e-01,  "PhiPi":2.6693e+00,  "KstK":2.0849e+00,  "KPiPi":9.2763e+00,  "PiPiPi":1.2886e+01}, "Fixed":True}
-    configdict["DsSignalShape"]["n2"]      = {"2011": {"NonRes":5.5608e+00,  "PhiPi":4.4751e-01,  "KstK":1.0774e+00,  "KPiPi":4.6466e+01,  "PiPiPi":6.9998e+01}, "Fixed":True}
-    configdict["DsSignalShape"]["frac"]    = {"2011": {"NonRes":0.25406,     "PhiPi":3.5389e-01,  "KstK":4.5702e-01,  "KPiPi":3.5803e-01,  "PiPiPi":4.9901e-01}, "Fixed":True}
-    configdict["DsSignalShape"]["scaleSigma"] = { "2011": {"frac1": 1.16, "frac2":1.19}}
-
-    # combinatorial background                                                                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"] = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]        = {"2011": {"NonRes":-3.5211e-03,  "PhiPi":-3.0873e-03,  "KstK":-2.3392e-03, "KPiPi":-1.0361e-03, "PiPiPi":-1.5277e-03}, "Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]        = {"2011": {"NonRes":0.0,          "PhiPi":0.0,          "KstK":0.0,         "KPiPi":0.0,         "PiPiPi":0.0}, "Fixed":True }
-    configdict["BsCombinatorialShape"]["frac"]  = {"2011": {"NonRes":4.3067e-01,   "PhiPi":6.5400e-01,   "KstK":3.7409e-01,  "KPiPi":1.0,         "PiPiPi":1.0}, 
-                                                        "Fixed":{"KPiPi":True,"PiPiPi":True}}
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" 
-    configdict["DsCombinatorialShape"]["cD"]         = {"2011": {"NonRes":-2.7520e-03,  "PhiPi":-2.7273e-03,  "KstK":-8.3967e-03, "KPiPi":-1.9193e-03, "PiPiPi":-4.5455e-03}, "Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"2011": {"NonRes":0.88620,      "PhiPi":0.37379,      "KstK":0.59093,     "KPiPi":1.0,         "PiPiPi":1.0}, 
-                                                         "Fixed":{"KPiPi":True,"PiPiPi":True}}
-
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "2011":{"All":0.5}, "2012":{"All":0.5}, "Fixed":False }
-
-    #Bd2Dsh background
-    #shape for BeautyMass, for CharmMass as well as BacPIDK taken by default the same as signal 
-    configdict["Bd2Ds(st)XShape"] = {}
-    configdict["Bd2Ds(st)XShape"]["type"]    = "ShiftedSignal"
-    configdict["Bd2Ds(st)XShape"]["decay"]   = "Bd2DsPi"
-    configdict["Bd2Ds(st)XShape"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2Ds(st)XShape"]["scale1"]  = {"Run1": {"All": 1.00808721452}, "Fixed":True}
-    configdict["Bd2Ds(st)XShape"]["scale2"]  = {"Run1": {"All": 1.03868673310}, "Fixed":True}
-
-
-    #
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"2011":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g1_f2_frac"] = {"2011":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-
-    #expected yields                                                                                                                                                       
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bd2DPi"]          = {"2011": { "NonRes":374.0,   "PhiPi":6.0,     "KstK":93.0,    "KPiPi":30.0,    "PiPiPi":0.0} ,     "Fixed":True}
-    configdict["Yields"]["Lb2LcPi"]         = {"2011": { "NonRes":290.0,   "PhiPi":36.0,    "KstK":69.0,    "KPiPi":1.0,     "PiPiPi":0.0} ,     "Fixed":True}
-    configdict["Yields"]["Bs2DsK"]          = {"2011": { "NonRes":40.0,    "PhiPi":47.0,    "KstK":40.0,    "KPiPi":8.0,     "PiPiPi":21.0} ,    "Fixed":True}
-    configdict["Yields"]["Bs2DsDsstPiRho"]  = {"2011": { "NonRes":100.0,   "PhiPi":100.0,   "KstK":100.0,   "KPiPi":100.0,   "PiPiPi":100.0},    "Fixed":False}
-    configdict["Yields"]["CombBkg"]         = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},  "Fixed":False}
-    configdict["Yields"]["Signal"]          = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0} , "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bd2DPi", "Lb2LcPi", "Bs2DsDsstPiRho", "Bs2DsK"] 
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kRed, kBlue-10, kGreen+3]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":2.5}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.7, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":1.2}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitToys.py b/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitToys.py
deleted file mode 100644
index 18fb2fc8f14bfdf41617e7ed5ccd8cd43745a38f..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitToys.py
+++ /dev/null
@@ -1,160 +0,0 @@
-from __future__ import division
-from past.utils import old_div
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # PHYSICAL PARAMETERS
-    configdict["BMass"]      = [5300,    5800    ]
-    configdict["DMass"]      = [1930,    2015    ]
-    configdict["Time"]       = [0.2,     15.0    ]
-    configdict["Momentum"]   = [3000.0,  650000.0]
-    configdict["TrMom"]      = [400.0,   45000.0 ]
-    configdict["PIDK"]       = [0.0,     150.0   ]
-    configdict["nTracks"]    = [15.0,    1000.0  ]
-
-    configdict["TagDec"]     = ["lab0_TAGDECISION_OS","lab0_SS_nnetKaon_DEC"]
-    configdict["lab0_TAGDECISION_OS"]  = [-1.0, 1.0]
-    configdict["lab0_SS_nnetKaon_DEC"] = [-1.0, 1.0]
-
-    configdict["TagOmega"]   = ["lab0_TAGOMEGA_OS","lab0_SS_nnetKaon_PROB"]
-    configdict["lab0_TAGOMEGA_OS"]  = [0.0, 0.5]
-    configdict["lab0_SS_nnetKaon_PROB"] = [0.0, 0.5]
-
-    configdict["calibration_p0"]  = [0.3927, 0.4244]
-    configdict["calibration_p1"]  = [0.9818, 1.2550]
-    configdict["calibration_av"]  = [0.3919, 0.4097]
-                                               
-    configdict["Terr"]       = [0.01,    0.1     ]
-    configdict["BachCharge"] = [-1000.0, 1000.0  ]
-    configdict["BDTG"]       = [0.3,     1.0     ]
-        
-    configdict["AdditionalVariables"] = [ "lab0_SS_Kaon_PROB", "lab0_SS_Kaon_DEC", 
-                                          "lab0_OS_Muon_PROB" , "lab0_OS_Muon_DEC",
-                                          "lab0_OS_Electron_PROB", "lab0_OS_Electron_DEC",
-                                          "lab0_OS_Kaon_PROB",  "lab0_OS_Kaon_DEC",
-                                          "lab0_OS_nnetKaon_PROB", "lab0_OS_nnetKaon_DEC",
-                                          "lab0_VtxCharge_PROB", "lab0_VtxCharge_DEC" ]
-
-    configdict["lab0_SS_Kaon_PROB"]      = [ -3.0, 1,0 ]
-    configdict["lab0_SS_Kaon_DEC"]       = [ -2.0, 2.0 ]
-    configdict["lab0_OS_Muon_PROB"]      = [ -3.0, 1.0 ]
-    configdict["lab0_OS_Muon_DEC"]       = [ -2.0, 2.0 ]
-    configdict["lab0_OS_Electron_PROB"]  = [-3.0, 1.0 ]
-    configdict["lab0_OS_Electron_DEC"]   = [ -2.0, 2.0 ]
-    configdict["lab0_OS_Kaon_PROB"]      = [ -3.0, 1.0 ]
-    configdict["lab0_OS_Kaon_DEC"]       = [ -2.0, 2.0 ]
-    configdict["lab0_OS_nnetKaon_PROB"]  = [ -3.0, 1.0 ]
-    configdict["lab0_OS_nnetKaon_DEC"]   = [ -2.0, 2.0 ]
-    configdict["lab0_VtxCharge_PROB"]    = [-3.0, 1.0 ]
-    configdict["lab0_VtxCharge_DEC"]     = [-2.0, 2.0 ]
-        
-    configdict["Bin1"]       = 20
-    configdict["Bin2"]       = 20
-    configdict["Bin3"]       = 10
-    configdict["Var1"]       = "lab1_PT"
-    configdict["Var2"]       = "nTracks"
-    configdict["Var3"]       = "lab1_P"
-    configdict["WeightingDimensions"] = 2
-    
-    configdict["PIDBach"]    = 0
-    configdict["PIDBach2"]   = 0
-    configdict["PIDChild"]   = 0
-    configdict["PIDProton"]  = 5    
-    configdict["dataName"]   = "../data/config_Bs2Dsh2011TDAna_Bs2DsPi.txt"
-    
-    configdict["fileCalibPionUp"]  = "/afs/cern.ch/work/a/adudziak/public/workspace/CalibDStUpPi_0.root"
-    configdict["fileCalibPionDown"]  = "/afs/cern.ch/work/a/adudziak/public/workspace/CalibDStDownPi_0.root"
-    configdict["fileCalibKaonUp"]  = "/afs/cern.ch/work/a/adudziak/public/workspace/CalibDStUpK_0.root"
-    configdict["fileCalibKaonDown"]  = "/afs/cern.ch/work/a/adudziak/public/workspace/CalibDStDownK_0.root"
-    configdict["workCalibPion"]  = "RSDStCalib"
-    configdict["workCalibKaon"]  = "RSDStCalib"
-
-    configdict["lumRatioDown"] =  0.59
-    configdict["lumRatioUp"] =  0.44
-    configdict["lumRatio"] =  old_div(configdict["lumRatioUp"],(configdict["lumRatioDown"]+configdict["lumRatioUp"]))
-    
-    # 1: NonRes, 2: PhiPi, 3: KstK, 4: KPiPi, 5: PiPiPi 
-    configdict["mean"]    = [5367.51, 5367.51, 5367.51, 5367.51, 5367.51]
-
-    # Bs signal shale without BKGCAT
-    configdict["sigma1_bc"]  = [1.1538e+01,  1.6598e+01,  1.1646e+01,  1.1428e+01,  1.1989e+01 ] #*1.252
-    configdict["sigma2_bc"]  = [1.6181e+01,  1.1488e+01,  1.4992e+01,  1.6866e+01,  1.7588e+01] #*1.777
-    configdict["alpha1_bc"]  = [1.9050e+00,  -2.0856e+00, 1.7019e+00,  1.9066e+00,  1.8497e+00 ] #*1.004 
-    configdict["alpha2_bc"]  = [-2.0423e+00, 1.8947e+00,  -1.8418e+00, -2.2615e+00, -2.0560e+00] #*0.832
-    configdict["n1_bc"]      = [1.1327e+00,  5.2735e+00,  1.2686e+00,  1.1585e+00,  1.2326e+00] 
-    configdict["n2_bc"]      = [6.1273e+00,  1.1497e+00,  9.6571e+00,  4.1167e+00,  7.8246e+00]
-    configdict["frac_bc"]    = [5.5417e-01,  4.4171e-01,  4.6731e-01,  5.9179e-01,  6.2376e-01]
-
-    #Bs signal shape with BKGCAT
-    configdict["sigma1_old"]  = [27.529,  17.396,  11.817,  11.400,  12.122 ] 
-    configdict["sigma2_old"]  = [12.787,  11.028,  15.076,  16.920,  17.871 ] 
-    configdict["alpha1_old"]  = [0.96505, 1.8615,  1.6457,  1.8601,  1.7911 ] 
-    configdict["alpha2_old"]  = [-5.0109, -2.6267, -1.8830, -2.1714, -1.9906] 
-    configdict["n1_old"]      = [1.7482,  1.3245,  1.3573,  1.1789,  1.3272 ]
-    configdict["n2_old"]      = [13.656,  2.1862,  6.4408,  4.6903,  7.4409 ]
-    configdict["frac_old"]    = [0.15836, 0.55406, 0.43593, 0.56224, 0.60804]
-
-    # ratio data/MC
-    configdict["sigma1Bsfrac"] = 1.22 
-    configdict["sigma2Bsfrac"] = 1.28
-    configdict["alpha1Bsfrac"] = 1.0 
-    configdict["alpha2Bsfrac"] = 1.0 
-
-    configdict["ratio1"]  = 1.00808721452
-    configdict["ratio2"]  = 1.0386867331        
-
-    configdict["meanDs"]    = [1968.49, 1968.49, 1968.49, 1968.49, 1968.49 ]
-
-    #Ds signal shapes without BKGCAT
-    configdict["sigma1Ds_bc"]  = [4.3930e+00,  8.7215e+00,  7.8768e+00,  6.7734e+00,  8.4187e+00 ] #*1.167
-    configdict["sigma2Ds_bc"]  = [7.1493e+00,  4.6238e+00,  4.5946e+00,  6.4937e+00,  7.2604e+00 ] #*1.096 
-    configdict["alpha1Ds_bc"]  = [2.1989e+00,  1.7979e+00,  1.9708e+00,  9.1754e-01,  9.4869e-01 ] #*1.140
-    configdict["alpha2Ds_bc"]  = [-2.0186e+00, -3.2123e+00, -2.7746e+00, -1.2753e+00, -1.0429e+00] #*1.022
-    configdict["n1Ds_bc"]      = [7.9389e-01,  2.6693e+00,  2.0849e+00,  9.2763e+00,  1.2886e+01 ]
-    configdict["n2Ds_bc"]      = [5.5608e+00,  4.4751e-01,  1.0774e+00,  4.6466e+01,  6.9998e+01 ]
-    configdict["fracDs_bc"]    = [0.25406,     3.5389e-01,  4.5702e-01,  3.5803e-01,  4.9901e-01 ]
-
-    #Ds signal shapes with BKGCAT
-    configdict["sigma1Ds_old"]  = [10.905,  7.6215,  11.224,  12.219,  8.3495 ]
-    configdict["sigma2Ds_old"]  = [5.1502,  4.4422,  5.3696,  6.2851,  7.5637 ] 
-    configdict["alpha1Ds_old"]  = [1.3862,  1.8802,  1.8513,  1.1467,  0.86168] 
-    configdict["alpha2Ds_old"]  = [-5.7329, -2.2066, -5.7517, -4.5438, -1.0479]
-    configdict["n1Ds_old"]      = [2.6391,  2.5713,  1.6705,  50.000,  49.990 ]
-    configdict["n2Ds_old"]      = [34.978,  1.8122,  34.310,  32.650,  69.998 ]
-    configdict["fracDs_old"]    = [0.19791, 0.44075, 0.17541, 0.21645, 0.49615]
-    
-    # ratio data/MC
-    configdict["sigma1Dsfrac"] = 1.16
-    configdict["sigma2Dsfrac"] = 1.19 
-    configdict["alpha1Dsfrac"] = 1.0 
-    configdict["alpha2Dsfrac"] = 1.0 
-        
-
-    # combinatorial background
-    configdict["cB1"]                = [-6.2895e-03, -9.3775e-03, -7.9542e-03, -7.1989e-03, -4.8664e-03]
-    configdict["cB2"]                = [0.0,          0.0,          0.0,         0.0,          0.0       ]
-    configdict["fracBsComb"]         = [7.8065e-01, 6.4053e-01, 7.7315e-01, 4.0456e-01, 5.1449e-01]
-    
-    configdict["cD"]        = [-4.2766e-03, -2.0470e-03, -4.4298e-03, -4.9326e-03, -2.1470e-03] 
-    configdict["fracComb"]  = [9.5698e-01, 5.9161e-01, 8.2227e-01,     1.0,         1.0]          
-
-    #expected Events
-    configdict["BdDPiEvents"]  = [374.0, 6.0,  93.0, 30.0, 0.0]
-    configdict["LbLcPiEvents"] = [290.0, 36.0, 69.0, 1.0,  0.0] #[312.0, 38.0, 69.0, 17.0,  0.0] #[301.0, 30.0, 68.0, 0.0,  0.0]
-    configdict["BsDsKEvents"]  = [40.0,  47.0, 40.0, 8.0,  21.0]
-        
-    configdict["assumedSig"]   = [10146.7, 13952.8,
-                                  10146.7, 13952.8,
-                                  10146.7, 13952.8,
-                                  752., 1195.,
-                                  1730., 2384.] #[9180.,13005.,730.,1160.,1680.,2315.]
-    configdict["nBd2DsPi"]     = 1./25. #1./30.
-    configdict["nBd2DsstPi"]   = 1./25. #1./30.
-    configdict["nBd2DstPi"]    = 1./4.
-    configdict["nBd2DRho"]     = 1./3.5
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsPi/config_Bs2Dsh2011TDAna_Bs2DsPi.txt b/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsPi/config_Bs2Dsh2011TDAna_Bs2DsPi.txt
deleted file mode 100644
index bb9a9e28958316bc22303eda68baf24934d2d26b..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/Bs2DsPi/config_Bs2Dsh2011TDAna_Bs2DsPi.txt
+++ /dev/null
@@ -1,257 +0,0 @@
-#B2DPi KPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bd2DPi_KPiPi_MD_OFFLINE.root
-MergedTree_Bd2DPi_KPiPi_MU_OFFLINE.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_KPiPi.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_KPiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-#Bs2DsPi KstK 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_KstK.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_KstK.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi NonRes 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_NonRes.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_NonRes.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PhiPi 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_PhiPi.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_PhiPi.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PiPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_PiPiPi.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_PiPiPi.root
-DecayTree
-DecayTree
-###
-
-#sWeights
-/afs/cern.ch/work/a/adudziak/public/sWeights/
-sWeights_BsDsPi_all_both.root
-sWeights_BsDsPi_all_both.root
-merged
-merged
-###
-
-
-#PIDp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_TightCuts.root
-EffHistos_Reco12_39Mom_Proton_MagUp_TightCuts.root
-###
-
-#PID
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PID2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_45678.root
-EffHistos_Reco12_39Mom_MagUp_3456.root
-###
-
-#RatioDataMC2D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-MomVsnTr_Comp_DPi_Down_hist.root
-MomVsnTr_Comp_DPi_Up_hist.root
-###
-
-#RatioDataMC3D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-PtVsnTrVsP_Comp_DPi_Down_hist.root
-PtVsnTrVsP_Comp_DPi_Up_hist.root
-###
-
-#MC FileName KKPi MD 2011
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsRho_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MU 2011
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsRho_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-#Kfactor MC FileName MD
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-#Kfactor MC FileName MU
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-
-#Signal Bs2DsPi HHHPi0 2011
-rfio:/castor/cern.ch/user/s/sgallori/lhcb/bs2dsk/13_01_2014/
-MergedTree_Signal_Bs2DsPi_Ds2HHHPi0Resolved_dw.root
-MergedTree_Signal_Bs2DsPi_Ds2HHHPi0Resolved_up.root
-DecayTreeTuple/tuple
-DecayTreeTuple/tuple
-###
-
-#Signal Bs2DsPi KstK 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_KstK.root
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_KstK.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal Bs2DsPi PhiPi 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_PhiPi.root
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_PhiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal Bs2DsPi NonRes 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_NonRes.root
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_NonRes.root
-DecayTree;1
-DecayTree;1
-###
-
-
-#Signal Bs2DsPi KPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2KPiPi_BsHypo_OFFLINE_DsPi_KPiPi.root
-MergedTree_Bs2DsPi_Ds2KPiPi_BsHypo_OFFLINE_DsPi_KPiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal Bs2DsPi PiPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2PiPiPi_BsHypo_OFFLINE_DsPi_PiPiPi.root
-MergedTree_Bs2DsPi_Ds2PiPiPi_BsHypo_OFFLINE_DsPi_PiPiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-
-
-#DPi misID lab5
-MyKaonEff_5
-MyKaonEff_m2
-MyKaonEff_m2
-MyKaonMisID_5
-MyKaonMisID_5
-###
-
-#DPi misID lab34 1
-MyKaonMisID_10
-MyKaonMisID_10
-MyKaonMisID_10
-MyKaonMisID_10
-MyKaonMisID_10
-###
-
-#DPi misID lab34 2
-MyKaonMisID_10_pKm5
-MyKaonMisID_10_pKm5
-MyKaonMisID_10_pKm5
-MyKaonMisID_10
-MyKaonMisID_10
-###
-
-#LcPi misID lab5
-MyProtonMisID_5_pK5;1
-MyProtonMisID_m2_pK5;1
-MyProtonMisID_5_pK5;1
-MyProtonMisID_10_pK5;1
-MyProtonMisID_5_p5;1
-###
-
-#LcPi misID lab4
-###
-
-#PID2m2
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_0123.root
-EffHistos_Reco12_39Mom_MagUp_2m2_012.root
-###
-
-#PID2m22
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_45678.root
-EffHistos_Reco12_39Mom_MagUp_2m2_3456.root
-###
-
-#PIDp3
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_Proton_DLLKDLLpK.root
-EffHistos_Reco12_39Mom_MagUp_Proton_DLLKDLLpK.root
-###
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/config_Bs2Dsh2011TDAna_Bs2DsK.txt b/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/config_Bs2Dsh2011TDAna_Bs2DsK.txt
deleted file mode 100644
index 90530f755269397a0c45e0b6e68123e0bb308958..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_1fbCPV/config_Bs2Dsh2011TDAna_Bs2DsK.txt
+++ /dev/null
@@ -1,294 +0,0 @@
-#Bs2DsK NonRes 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsK_NonRes.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsK_NonRes.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK PhiPi 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsK_PhiPi.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsK_PhiPi.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK KstK 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsK_KstK.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsK_KstK.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK KPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsK_KPiPi.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsK_KPiPi.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK PiPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsK_PiPiPi.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsK_PiPiPi.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_KPiPi.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_KPiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-#Bs2DsPi KstK 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_KstK.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_KstK.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi NonRes 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_NonRes.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_NonRes.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PhiPi 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_PhiPi.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_PhiPi.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PiPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_PiPiPi.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_PiPiPi.root
-DecayTree
-DecayTree
-###
-
-#sWeights
-/afs/cern.ch/work/a/adudziak/public/sWeights/
-sWeights_BsDsK_all_both.root
-sWeights_BsDsK_all_both.root
-merged
-merged
-###
-
-
-#PIDp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_TightCuts.root
-EffHistos_Reco12_39Mom_Proton_MagUp_TightCuts.root
-###
-
-#PID
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PID2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_45678.root
-EffHistos_Reco12_39Mom_MagUp_3456.root
-###
-
-#RatioDataMC2D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-MomVsnTr_Comp_DPi_Down_hist.root
-MomVsnTr_Comp_DPi_Up_hist.root
-###
-
-#MC FileName KKPi MD 2011
-{"Mode":"Bd2DK",     
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DK_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"} 
-{"Mode":"Bs2DsRho",  
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsRho_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstK",  
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi", 
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",    
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",  
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsstp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",    
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcK_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",   
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",    
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MU 2011
-{"Mode":"Bd2DK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DK_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsRho_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsstp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcK_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-#Kfactor MC FileName MD
-{"Mode":"Bd2DK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DK_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsRho_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsstp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcK_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-#Kfactor MC FileName MU
-{"Mode":"Bd2DK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DK_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsRho_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsstp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcK_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-
-#Signal Bs2DsK KstK 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_OFFLINE_DsK_KstK.root
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_OFFLINE_DsK_KstK.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal Bs2DsK PhiPi 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_OFFLINE_DsK_PhiPi.root
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_OFFLINE_DsK_PhiPi.root
-DecayTree;1
-DecayTree;1
-###
- 
-#Signal Bs2DsK NonRes 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_OFFLINE_DsK_NonRes.root
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_OFFLINE_DsK_NonRes.root
-DecayTree;1
-DecayTree;1
-###
-
-
-#Signal Bs2DsK KPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsK_Ds2KPiPi_BsHypo_OFFLINE_DsK_KPiPi.root
-MergedTree_Bs2DsK_Ds2KPiPi_BsHypo_OFFLINE_DsK_KPiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal Bs2DsK PiPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsK_Ds2PiPiPi_BsHypo_OFFLINE_DsK_PiPiPi.root
-MergedTree_Bs2DsK_Ds2PiPiPi_BsHypo_OFFLINE_DsK_PiPiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-
-#PID2m2
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_0123.root
-EffHistos_Reco12_39Mom_MagUp_2m2_012.root
-###
-
-#PID2m22
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_45678.root
-EffHistos_Reco12_39Mom_MagUp_2m2_3456.root
-###
-
-#PIDp3
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_Proton_DLLKDLLpK.root
-EffHistos_Reco12_39Mom_MagUp_Proton_DLLKDLLpK.root
-###
-
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/BDTG/Bs2DsPi/Bs2DsPiConfigForNominalMassFit.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/BDTG/Bs2DsPi/Bs2DsPiConfigForNominalMassFit.py
deleted file mode 100644
index b69e3dbfc70f3004c914d1fc9d96eaf9c5699988..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/BDTG/Bs2DsPi/Bs2DsPiConfigForNominalMassFit.py
+++ /dev/null
@@ -1,197 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bs2DsPi"
-    configdict["CharmModes"] = {"KKPi"}
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2011"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2011":"21"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                  
-    configdict["IntegratedLuminosity"] = {"2011": {"Down": 0.59, "Up": 0.44}}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/BDTG/Bs2DsPi/config_Bs2DsPi.txt"
-    #settings for control plots                                                                                                                                                           
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsPi", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-#    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5310,    5430    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [-1000.0,     1000.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    #configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    #configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-#    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,     5.0   ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-100000.0,   150     ], "InputName" : "lab1_PIDK"}
-    #configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    #configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    #configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    #configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.3,     1.0     ], "InputName" : "BDTGResponse_1"}
-    #configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    #configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    #configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    #configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration                                                                                               
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3834, "p1": 0.9720, "average": 0.3813}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4244, "p1": 1.2180, "average": 0.4097}
-
-    # additional cuts applied to data sets                                                                                    
-    #configdict["AdditionalCuts"] = {}
-    #configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0",            "MC" : "lab2_TAU>0&&lab1_M<200", "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    #configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    #configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    #configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9&&lab45_MM<1700", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                              
-    # order of particles: KKPi, KPiPi, PiPiPi                                                                                                         
-    configdict["DsChildrenPrefix"] = {"Child1":"lab5","Child2":"lab4","Child3": "lab3"}
-
-    # additional variables in data sets                                                                                                             
-    configdict["AdditionalVariables"] = {}
-    configdict["AdditionalVariables"]["lab0_DIRA_OWNPV"]                 =  { "Range" : [ -3.0, 2,0 ], "InputName" : "lab0_DIRA_OWNPV"}
-    configdict["AdditionalVariables"]["lab0_MINIPCHI2"]                  =  { "Range" : [ -3.0, 7000,0 ], "InputName" : "lab0_MINIPCHI2"}
-    configdict["AdditionalVariables"]["lab0_RFD"]                        =  { "Range" : [ -3.0, 18,0 ], "InputName" : "lab0_RFD"}
-    configdict["AdditionalVariables"]["lab0_VCHI2NDOF"]                  =  { "Range" : [ -12.0, 12,0 ], "InputName" : "lab0_VCHI2NDOF"}
-    configdict["AdditionalVariables"]["lab0_LifetimeFit_VCHI2NDOF"]      =  { "Range" : [ -10.0, 900,0 ], "InputName" : "lab0_LifetimeFit_VCHI2NDOF"}
-    configdict["AdditionalVariables"]["lab2_DIRA_OWNPV"]                 =  { "Range" : [ -3.0, 3,0 ], "InputName" : "lab2_DIRA_OWNPV"}
-    configdict["AdditionalVariables"]["lab2_DIRA_ORIVX"]                 =  { "Range" : [ -3.0, 3,0 ], "InputName" : "lab2_DIRA_ORIVX"}
-    configdict["AdditionalVariables"]["lab2_MINIPCHI2"]                  =  { "Range" : [ -3.0, 180000,0 ], "InputName" : "lab2_MINIPCHI2"}
-    configdict["AdditionalVariables"]["lab2_RFD"]                        =  { "Range" : [ -3.0, 20,0 ], "InputName" : "lab2_RFD"}
-    configdict["AdditionalVariables"]["lab2_VCHI2NDOF"]                  =  { "Range" : [ -5.0, 12,0 ], "InputName" : "lab2_VCHI2NDOF"}
-    configdict["AdditionalVariables"]["lab1_MINIPCHI2"]                  =  { "Range" : [ -3.0, 220000,0 ], "InputName" : "lab1_MINIPCHI2"}
-    configdict["AdditionalVariables"]["lab1_PT"]                         =  { "Range" : [    0, 160000,0 ], "InputName" : "lab1_PT"}
-    configdict["AdditionalVariables"]["lab1_CosTheta"]                   =  { "Range" : [    -3, 3,0 ], "InputName" : "lab1_CosTheta"}
-    configdict["AdditionalVariables"]["lab345_MIN_PT"]                   =  { "Range" : [ -3.0, 14000,0 ], "InputName" : "lab345_MIN_PT"}
-    configdict["AdditionalVariables"]["lab345_MIN_MINIPCHI2"]            =  { "Range" : [ -3.0, 28000,0 ], "InputName" : "lab345_MIN_MINIPCHI2"}
-    configdict["AdditionalVariables"]["lab1345_TRACK_GhostProb"]         =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab1345_TRACK_GhostProb"}
-
-    configdict["AdditionalVariables"]["lab0_DIRA_OWNPV_Log"]                 =  { "Range" : [ -3.0, 2,0 ], "InputName" : "lab0_DIRA_OWNPV_Log"}
-    configdict["AdditionalVariables"]["lab0_LifetimeFit_VCHI2NDOF_Log"]      =  { "Range" : [ -12.0, 900,0 ], "InputName" : "lab0_LifetimeFit_VCHI2NDOF_Log"}
-    configdict["AdditionalVariables"]["lab0_VCHI2NDOF_Log"]                  =  { "Range" : [ -12.0, 12,0 ], "InputName" : "lab0_VCHI2NDOF_Log"}
-    configdict["AdditionalVariables"]["lab0_RFD_Log"]                        =  { "Range" : [ -3.0, 18,0 ], "InputName" : "lab0_RFD_Log"}
-    configdict["AdditionalVariables"]["lab1_MINIPCHI2_Log"]                  =  { "Range" : [ -3.0, 220000,0 ], "InputName" : "lab1_MINIPCHI2_Log"}
-    configdict["AdditionalVariables"]["lab1_PT_Log"]                         =  { "Range" : [    0, 160000,0 ], "InputName" : "lab1_PT_Log"}
-    configdict["AdditionalVariables"]["lab2_MINIPCHI2_Log"]                  =  { "Range" : [ -3.0, 180000,0 ], "InputName" : "lab2_MINIPCHI2_Log"}
-    configdict["AdditionalVariables"]["lab2_RFD_Log"]                        =  { "Range" : [ -3.0, 20,0 ], "InputName" : "lab2_RFD_Log"}
-    configdict["AdditionalVariables"]["lab345_MIN_PT_Log"]                   =  { "Range" : [ -3.0, 14000,0 ], "InputName" : "lab345_MIN_PT_Log"}
-    configdict["AdditionalVariables"]["lab345_MIN_MINIPCHI2_Log"]            =  { "Range" : [ -3.0, 28000,0 ], "InputName" : "lab345_MIN_MINIPCHI2_Log"}
-    configdict["AdditionalVariables"]["NewBDTG_classifier"]                  =  { "Range" : [ -3.0, 28000,0 ], "InputName" : "NewBDTG_classifier"}
-
-
-    #configdict["AdditionalVariables"]["tagOmegaSSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_SS_Kaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecSSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_SS_Kaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSMuon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Muon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSMuon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Muon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSElectron"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Electron_PROB"}
-    #configdict["AdditionalVariables"]["tagDecSSElectron"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Electron_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Kaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Kaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSnnetKaon"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_nnetKaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSnnetKaon"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_nnetKaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSVtxCharge"] =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_VtxCharge_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSVtxCharge"]   =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_VtxCharge_DEC" }
-
-
-    #weighting templates by PID eff/misID                                                                                                                                                 
-#    configdict["WeightingMassTemplates"]= { "Variables":["lab4_P","lab5_P"], "PIDBach": 0, "PIDChild": 0, "PIDProton": 5, "RatioDataMC":True }
-
-    #weighting for PID templates                                                                                                                                                          
-#    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[20,20] }
-#    configdict["Calibrations"] = {}
-#    configdict["Calibrations"]["2011"] = {}
-#    configdict["Calibrations"]["2011"]["Pion"]   = {}
-#    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID0_Str20r1.root"}
-#    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID0_Str20r1.root"}
-#    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-#    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID0_Str20r1.root"}
-#    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID0_Str20r1.root"}
-#    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-#    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-#    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/work_Comb_DsPi_5358.root",
-#                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up", "Type":"Special",
-#                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-#    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/work_Comb_DsPi_5358.root",
-#                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down", "Type":"Special",
-#                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-#
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes                                                                                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBall"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5.3656e+03}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"2011": {"KKPi":1.2859e+01},  "Fixed":False}
-    configdict["BsSignalShape"]["sigma2"]  = {"2011": {"KKPi":1.9039e+01},  "Fixed":False}
-#    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5.3657e+03}, "Fixed":True}
-#    configdict["BsSignalShape"]["sigma1"]  = {"2011": {"KKPi":1.9404e+01},  "Fixed":True}
-#    configdict["BsSignalShape"]["sigma2"]  = {"2011": {"KKPi":1.3594e+01},  "Fixed":True}
-    configdict["BsSignalShape"]["alpha1"]  = {"2011": {"KKPi":-2.0856e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha2"]  = {"2011": {"KKPi":1.8947e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["n1"]      = {"2011": {"KKPi":5.2735e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"2011": {"KKPi":1.1497e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["frac"]    = {"2011": {"KKPi":4.4171e-01},  "Fixed":True}
-
-
-    #Ds signal shapes
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBall"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma1"]  = {"2011": {"NonRes":4.3930e+00,  "PhiPi":8.7215e+00,  "KstK":7.8768e+00,  "KPiPi":6.7734e+00,  "PiPiPi":8.4187e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["sigma2"]  = {"2011": {"NonRes":7.1493e+00,  "PhiPi":4.6238e+00,  "KstK":4.5946e+00,  "KPiPi":6.4937e+00,  "PiPiPi":7.2604e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha1"]  = {"2011": {"NonRes":2.1989e+00,  "PhiPi":1.7979e+00,  "KstK":1.9708e+00,  "KPiPi":9.1754e-01,  "PiPiPi":9.4869e-01}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha2"]  = {"2011": {"NonRes":-2.0186e+00, "PhiPi":-3.2123e+00, "KstK":-2.7746e+00, "KPiPi":-1.2753e+00, "PiPiPi":-1.0429e+00},"Fixed":True}
-    configdict["DsSignalShape"]["n1"]      = {"2011": {"NonRes":7.9389e-01,  "PhiPi":2.6693e+00,  "KstK":2.0849e+00,  "KPiPi":9.2763e+00,  "PiPiPi":1.2886e+01}, "Fixed":True}
-    configdict["DsSignalShape"]["n2"]      = {"2011": {"NonRes":5.5608e+00,  "PhiPi":4.4751e-01,  "KstK":1.0774e+00,  "KPiPi":4.6466e+01,  "PiPiPi":6.9998e+01}, "Fixed":True}
-    configdict["DsSignalShape"]["frac"]    = {"2011": {"NonRes":0.25406,     "PhiPi":3.5389e-01,  "KstK":4.5702e-01,  "KPiPi":3.5803e-01,  "PiPiPi":4.9901e-01}, "Fixed":True}
-    configdict["DsSignalShape"]["scaleSigma"] = { "2011": {"frac1": 1.16, "frac2":1.19}}
-
-    # combinatorial background                                                                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"] = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB2"]        = {"2011": {"KKPi":0.0},  "Fixed":True }
-    configdict["BsCombinatorialShape"]["cB1"]        = {"2011": {"KKPi":-6.4826e-03}, "Fixed": False}
-    configdict["BsCombinatorialShape"]["frac"]  = {"2011": {"KKPi":2.7086e-01}, "Fixed":False}
-#    configdict["BsCombinatorialShape"]["cB1"]        = {"2011": {"KKPi":-6.2744e-03}, "Fixed":True}
-#    configdict["BsCombinatorialShape"]["frac"]  = {"2011": {"KKPi":2.7216e-01}, "Fixed":True}
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" 
-    configdict["DsCombinatorialShape"]["cD"]         = {"2011": {"NonRes":-2.7520e-03,  "PhiPi":-2.7273e-03,  "KstK":-8.3967e-03, "KPiPi":-1.9193e-03, "PiPiPi":-4.5455e-03}, 
-                                                        "Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"2011": {"NonRes":0.88620,      "PhiPi":0.37379,      "KstK":0.59093,     "KPiPi":1.0,         "PiPiPi":1.0}, 
-                                                         "Fixed":{"KPiPi":True,"PiPiPi":True}}
-
-
-    #expected yields                                                                                                                                                       
-    configdict["Yields"] = {}
-    configdict["Yields"]["CombBkg"]         = {"2011": { "KKPi":1000000.0},  "Fixed":False}
-    configdict["Yields"]["Signal"]          = {"2011": { "KKPi":1000000.0} , "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg"] #, "Bd2DPi", "Lb2LcPi", "Bs2DsDsstPiRho", "Bs2DsK"] 
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6] #, kOrange, kRed, kBlue-10, kGreen+3]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":2.5}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.7, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":1.2}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/BDTG/Bs2DsPi/config_Bs2DsPi.txt b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/BDTG/Bs2DsPi/config_Bs2DsPi.txt
deleted file mode 100644
index 60d70a2baafd4fca0c51dc170c9bb9ae5465d059..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/BDTG/Bs2DsPi/config_Bs2DsPi.txt
+++ /dev/null
@@ -1,258 +0,0 @@
-#B2DPi KPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bd2DPi_KPiPi_MD_OFFLINE.root
-MergedTree_Bd2DPi_KPiPi_MU_OFFLINE.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KKPi 2011
-/fhgfs/users/eitsch/storage/Tuple/BDT_CorrConsts_Dspi/
-20112012_Up_AddedObservables_Doubles_Bs_BdtPrecuts_mod2zero__BDTG2016_MySplit_M2nZ_cut.root
-20112012_Dw_AddedObservables_Doubles_Bs_BdtPrecuts_mod2zero__BDTG2016_MySplit_M2nZ_cut.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PhiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb/OFFLINE/
-DsK_2011_Dw_OFFLINE_Bs_Dspi_phipi.root
-DsK_2011_Up_OFFLINE_Bs_Dspi_phipi.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KstK 2011
-root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb/OFFLINE/
-DsK_2011_Dw_OFFLINE_Bs_Dspi_KstK.root
-DsK_2011_Up_OFFLINE_Bs_Dspi_KstK.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb/OFFLINE/
-DsK_2011_Dw_OFFLINE_Bs_Dspi_Kpipi.root
-DsK_2011_Up_OFFLINE_Bs_Dspi_Kpipi.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PiPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb/OFFLINE/
-DsK_2011_Dw_OFFLINE_Bs_Dspi_pipipi.root
-DsK_2011_Up_OFFLINE_Bs_Dspi_pipipi.root
-DecayTree
-DecayTree
-###
-
-
-#sWeights
-/afs/cern.ch/work/a/adudziak/public/sWeights/
-sWeights_BsDsPi_all_both.root
-sWeights_BsDsPi_all_both.root
-merged
-merged
-###
-
-
-#PIDp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_TightCuts.root
-EffHistos_Reco12_39Mom_Proton_MagUp_TightCuts.root
-###
-
-#PID
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PID2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_45678.root
-EffHistos_Reco12_39Mom_MagUp_3456.root
-###
-
-#RatioDataMC2D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-MomVsnTr_Comp_DPi_Down_hist.root
-MomVsnTr_Comp_DPi_Up_hist.root
-###
-
-#RatioDataMC3D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-PtVsnTrVsP_Comp_DPi_Down_hist.root
-PtVsnTrVsP_Comp_DPi_Up_hist.root
-###
-
-#MC FileName KKPi MD 2011
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsRho_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MU 2011
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsRho_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-#Kfactor MC FileName MD
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-#Kfactor MC FileName MU
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-
-#Signal Bs2DsPi HHHPi0 2011
-rfio:/castor/cern.ch/user/s/sgallori/lhcb/bs2dsk/13_01_2014/
-MergedTree_Signal_Bs2DsPi_Ds2HHHPi0Resolved_dw.root
-MergedTree_Signal_Bs2DsPi_Ds2HHHPi0Resolved_up.root
-DecayTreeTuple/tuple
-DecayTreeTuple/tuple
-###
-
-#Signal Bs2DsPi KstK 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_KstK.root
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_KstK.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal Bs2DsPi PhiPi 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_PhiPi.root
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_PhiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal Bs2DsPi NonRes 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_NonRes.root
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_NonRes.root
-DecayTree;1
-DecayTree;1
-###
-
-
-#Signal Bs2DsPi KPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2KPiPi_BsHypo_OFFLINE_DsPi_KPiPi.root
-MergedTree_Bs2DsPi_Ds2KPiPi_BsHypo_OFFLINE_DsPi_KPiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal Bs2DsPi PiPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2PiPiPi_BsHypo_OFFLINE_DsPi_PiPiPi.root
-MergedTree_Bs2DsPi_Ds2PiPiPi_BsHypo_OFFLINE_DsPi_PiPiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-
-
-#DPi misID lab5
-MyKaonEff_5
-MyKaonEff_m2
-MyKaonEff_m2
-MyKaonMisID_5
-MyKaonMisID_5
-###
-
-#DPi misID lab34 1
-MyKaonMisID_10
-MyKaonMisID_10
-MyKaonMisID_10
-MyKaonMisID_10
-MyKaonMisID_10
-###
-
-#DPi misID lab34 2
-MyKaonMisID_10_pKm5
-MyKaonMisID_10_pKm5
-MyKaonMisID_10_pKm5
-MyKaonMisID_10
-MyKaonMisID_10
-###
-
-#LcPi misID lab5
-MyProtonMisID_5_pK5;1
-MyProtonMisID_m2_pK5;1
-MyProtonMisID_5_pK5;1
-MyProtonMisID_10_pK5;1
-MyProtonMisID_5_p5;1
-###
-
-#LcPi misID lab4
-###
-
-#PID2m2
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_0123.root
-EffHistos_Reco12_39Mom_MagUp_2m2_012.root
-###
-
-#PID2m22
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_45678.root
-EffHistos_Reco12_39Mom_MagUp_2m2_3456.root
-###
-
-#PIDp3
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_Proton_DLLKDLLpK.root
-EffHistos_Reco12_39Mom_MagUp_Proton_DLLKDLLpK.root
-###
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bd2DPi/Bd2DPiConfigForNominalMassFit.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bd2DPi/Bd2DPiConfigForNominalMassFit.py
deleted file mode 100644
index cbcddad1067cb21c2442a8237c48be9864785c02..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bd2DPi/Bd2DPiConfigForNominalMassFit.py
+++ /dev/null
@@ -1,171 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bd2DPi"
-    configdict["CharmModes"] = {"KPiPi"}
-    configdict["Backgrounds"] = ["Bd2DK","Bd2DRho","Bd2DstPi","Lb2LcPi","Bs2DsPi"]
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2011", "2012"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                  
-    configdict["IntegratedLuminosity"] = {"2011": {"Down": 0.59, "Up": 0.44}, "2012":{"Down": 0.9894, "Up": 0.9985}}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/Bd2DPi/config_Bd2DPi.txt"
-    #settings for control plots                                                                                                                                                           
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBd2DPi", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5000,    6000    ], "InputName" : "lab0_MassFitConsD_M"}
-    #configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5200,    6000    ], "InputName" : "lab0_MassFitConsD_M"} #Stefano: narrow
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1830,    1920    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,    6.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.0,     1.0     ], "InputName" : "BDTGResponse_2"} #Stefano (use new BDTG)
-    #configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    #configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    #configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    #configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration                                                                                               
-    #configdict["TaggingCalibration"] = {}
-    #configdict["TaggingCalibration"]["OS"] = {"p0": 0.3834, "p1": 0.9720, "average": 0.3813}
-    #configdict["TaggingCalibration"]["SS"] = {"p0": 0.4244, "p1": 1.2180, "average": 0.4097}
-
-    # additional cuts applied to data sets                                                                                    
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0",            "MC" : "lab2_TAU>0&&lab1_M<200", "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                              
-    # order of particles: KKPi, KPiPi, PiPiPi                                                                                                         
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"} #lab3 = K, lab4, lab5 = pi
-
-    # weighting templates by PID eff/misID                                                                                                                                                 
-    configdict["WeightingMassTemplates"] = {"Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} } # Stefano (PID MC-reweight not applied)
-    #configdict["WeightingMassTemplates"] = { "Variables":["lab4_P","lab3_P"], "PIDBach": 0, "PIDChild": 0, "PIDProton": 5, "RatioDataMC":True }
-
-    # Stefano (add Flavour Tagging variables (for Giulia and Stefano P.)) 
-    configdict["AdditionalVariables"] = {}
-    configdict["AdditionalVariables"]["tagOmegaSSPionBDT"] =  { "Range" : [ 0.0, 0.5 ], "InputName" : "lab0_SS_PionBDT_PROB"}
-    configdict["AdditionalVariables"]["tagDecSSPionBDT"]   =  { "Range" : [ -1.0, 1.0 ], "InputName" : "lab0_SS_PionBDT_DEC"}
-    configdict["AdditionalVariables"]["tagOmegaSSProton"]  =  { "Range" : [ 0.0, 0.5 ], "InputName" : "lab0_SS_Proton_PROB"}
-    configdict["AdditionalVariables"]["tagDecSSProton"]    =  { "Range" : [ -1.0, 1.0 ], "InputName" : "lab0_SS_Proton_DEC"}
-    configdict["AdditionalVariables"]["nPV"]               =  { "Range" : [ 1.0, 7.0 ], "InputName" : "nPV"}
-    configdict["AdditionalVariables"]["BeautyPt"]          =  { "Range" : [ 0.0, 35000 ], "InputName" : "lab0_PT"}
-    configdict["AdditionalVariables"]["BeautyPz"]          =  { "Range" : [ 0.0, 700000.0 ], "InputName" : "lab0_PZ"}
-    configdict["AdditionalVariables"]["BeautyPx"]          =  { "Range" : [ -40000.0, 40000.0 ], "InputName" : "lab0_PX"}
-    configdict["AdditionalVariables"]["BeautyPy"]          =  { "Range" : [ -40000.0, 40000.0 ], "InputName" : "lab0_PY"}
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    # Stefano: updated to 2012 MC
-    # Bs signal shapes 
-    # up + dw                                                                                                                                     
-    configdict["BsSignalShape"] = {} 
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5280.0},     "Fixed": False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"KPiPi":12.763},  "Fixed": True} 
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"KPiPi":21.389},  "Fixed": True} 
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"KPiPi":1.9990},  "Fixed": True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"KPiPi":-2.1618}, "Fixed": True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"KPiPi":1.0928},  "Fixed": True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"KPiPi":2.4010},  "Fixed": True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"KPiPi":0.68930}, "Fixed": True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"KPiPi":1.0 },    "Fixed": False}
-
-    # MC smeared (5000-5600 MeV)
-    #configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5280.},     "Fixed": False}
-    #configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"KPiPi":15.483},  "Fixed": True} 
-    #configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"KPiPi":18.624},  "Fixed": True} 
-    #configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"KPiPi":1.3330},  "Fixed": True}
-    #configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"KPiPi":-1.2472}, "Fixed": True}
-    #configdict["BsSignalShape"]["n1"]      = {"Run1": {"KPiPi":1.9093},  "Fixed": True}
-    #configdict["BsSignalShape"]["n2"]      = {"Run1": {"KPiPi":5.1967},  "Fixed": True}
-    #configdict["BsSignalShape"]["frac"]    = {"Run1": {"KPiPi":0.57147}, "Fixed": True}
-
-
-    # Ds signal shapes  
-    # up + dw                                                                                                                                     
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1869.8},       "Fixed": False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"KPiPi":11.501},     "Fixed": True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"KPiPi":6.1237},     "Fixed": True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"KPiPi":1.6382},     "Fixed": True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"KPiPi":-3.4683},    "Fixed": True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"KPiPi":4.8678},     "Fixed": True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"KPiPi":4.3285e-06}, "Fixed": True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"KPiPi":0.38916},    "Fixed": True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"KPiPi":1.0 },       "Fixed": False}
-
-    # combinatorial background                                                                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"KPiPi":-1.0361e-03}, "Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"KPiPi":-0.01},       "Fixed": False}
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"KPiPi":0.5},         "Fixed": False}
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusDoubleCrystalBallWithWidthRatioSharedMean"
-    configdict["DsCombinatorialShape"]["sigma1"]  = {"Run1": {"KPiPi":11.501},          "Fixed":True}
-    configdict["DsCombinatorialShape"]["sigma2"]  = {"Run1": {"KPiPi":6.1237},          "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha1"]  = {"Run1": {"KPiPi":1.6382},          "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha2"]  = {"Run1": {"KPiPi":-3.4683},         "Fixed":True}
-    configdict["DsCombinatorialShape"]["n1"]      = {"Run1": {"KPiPi":4.8678},          "Fixed":True}
-    configdict["DsCombinatorialShape"]["n2"]      = {"Run1": {"KPiPi":4.3285e-06},      "Fixed":True}
-    configdict["DsCombinatorialShape"]["frac"]    = {"Run1": {"KPiPi":0.38916},         "Fixed":True}
-    configdict["DsCombinatorialShape"]["R"]       = {"Run1": {"KPiPi":1.5},             "Fixed":False}
-    configdict["DsCombinatorialShape"]["cB"]      = {"Run1": {"KPiPi":-1.9193e-03},     "Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"KPiPi":0.5},             "Fixed":False}
-
-    #configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" 
-    #configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" 
-    #configdict["DsCombinatorialShape"]["cD"]    = {"Run1": {"KPiPi":-3e-03},      "Fixed": False}
-    #configdict["DsCombinatorialShape"]["fracD"] = {"Run1": {"KPiPi":0.5},         "Fixed": False}
-
-    # Che cosa e'???
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed": False} 
-    configdict["AdditionalParameters"]["g1_f2_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed": False}
-
-    # expected yields #Stefano: fix Bs2DsPi & Lb2LcPi 
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bd2DK"]     = {"2011": {"KPiPi":15000.0},  "2012": {"KPiPi":30000.0},  "Fixed": False} 
-    configdict["Yields"]["Bd2DRho"]   = {"2011": {"KPiPi":80000.0},  "2012": {"KPiPi":160000.0}, "Fixed": False}
-    configdict["Yields"]["Bd2DstPi"]  = {"2011": {"KPiPi":60000.0},  "2012": {"KPiPi":120000.0}, "Fixed": False}
-    configdict["Yields"]["Bs2DsPi"]   = {"2011": {"KPiPi":1000.0},   "2012": {"KPiPi":2000.0},   "Fixed": True}
-    configdict["Yields"]["Lb2LcPi"]   = {"2011": {"KPiPi":250.0},    "2012": {"KPiPi":500.0},    "Fixed": True}
-    configdict["Yields"]["CombBkg"]   = {"2011": {"KPiPi":30000.0},  "2012": {"KPiPi":60000.0},  "Fixed": False}
-    configdict["Yields"]["Signal"]    = {"2011": {"KPiPi":150000.0}, "2012": {"KPiPi":300000.0}, "Fixed": False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bd2DK", "Lb2LcPi", "Bs2DsPi", "Bd2DRho", "Bd2DstPi"] 
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kRed, kBlue-10, kYellow, kBlue+2]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":2.5}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.7, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":1.2}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bd2DPi/SignalConfigForFit.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bd2DPi/SignalConfigForFit.py
deleted file mode 100644
index d9a5cf67f5f6197aef3c3b173cf410c463b66e3d..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bd2DPi/SignalConfigForFit.py
+++ /dev/null
@@ -1,109 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bd2DPi"
-    configdict["CharmModes"] = {"KPiPi"}
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2011"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                  
-    configdict["IntegratedLuminosity"] = {"2011": {"Down": 0.59, "Up": 0.44}, "2012":{"Down": 0.9894, "Up": 0.9985}}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/Bd2DPi/config_Bd2DPi.txt"
-    #settings for control plots                                                                                                                                                           
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBd2DPi", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5000,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1830,    1920    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,    6.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.0,     1.0     ], "InputName" : "BDTGResponse_2"} #Stefano (use new BDTG)
-
-    # additional cuts applied to data sets                                                                                    
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0",            "MC" : "lab2_TAU>0&&lab1_M<200", "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                              
-    # order of particles: KKPi, KPiPi, PiPiPi                                                                                                         
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-    #weighting templates by PID eff/misID                                                                                                                                                 
-    configdict["WeightingMassTemplates"] = {} #Stefano (PID MC-reweight not applied)
-    #configdict["WeightingMassTemplates"] = { "Variables":["lab4_P","lab3_P"], "PIDBach": 0, "PIDChild": 0, "PIDProton": 5, "RatioDataMC":True }
-
-    #Stefano (add Flavour Tagging variables (for Giulia and Stefano P.)) 
-    configdict["AdditionalVariables"] = {}
-    configdict["AdditionalVariables"]["tagOmegaSSPionBDT"] =  { "Range" : [ 0.0, 0.5 ], "InputName" : "lab0_SS_PionBDT_PROB"}
-    configdict["AdditionalVariables"]["tagDecSSPionBDT"]   =  { "Range" : [ -1.0, 1.0 ], "InputName" : "lab0_SS_PionBDT_DEC"}
-    configdict["AdditionalVariables"]["tagOmegaSSProton"]  =  { "Range" : [ 0.0, 0.5 ], "InputName" : "lab0_SS_Proton_PROB"}
-    configdict["AdditionalVariables"]["tagDecSSProton"]    =  { "Range" : [ -1.0, 1.0 ], "InputName" : "lab0_SS_Proton_DEC"}
-    configdict["AdditionalVariables"]["nPV"]               =  { "Range" : [ 1.0, 7.0 ], "InputName" : "nPV"}
-    configdict["AdditionalVariables"]["BeautyPt"]          =  { "Range" : [ 0.0, 35000 ], "InputName" : "lab0_PT"}
-    configdict["AdditionalVariables"]["BeautyPz"]          =  { "Range" : [ 0.0, 700000.0 ], "InputName" : "lab0_PZ"}
-    configdict["AdditionalVariables"]["BeautyPx"]          =  { "Range" : [ -40000.0, 40000.0 ], "InputName" : "lab0_PX"}
-    configdict["AdditionalVariables"]["BeautyPy"]          =  { "Range" : [ -40000.0, 40000.0 ], "InputName" : "lab0_PY"}
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes                                                                                                                                   
-    configdict["BsSignalShape"] = {} #Stefano (fit all params)
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBall"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5283.}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"KPiPi":8.6},  "Fixed":False} 
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"KPiPi":14.5},  "Fixed":False} 
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"KPiPi":0.9},  "Fixed":False}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"KPiPi":-2.1}, "Fixed":False}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"KPiPi":1.8},  "Fixed":False}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"KPiPi":5.4},  "Fixed":False}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"KPiPi":0.25},  "Fixed":False}
-    
-    #Ds signal shapes                                                                                                                                       
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBall"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1869.8}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"KPiPi":10.0}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"KPiPi":5.6}, "Fixed":False}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"KPiPi":1.7}, "Fixed":False}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"KPiPi":-3.0},"Fixed":False}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"KPiPi":1.5}, "Fixed":False}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"KPiPi":0.6}, "Fixed":False}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"KPiPi":0.41}, "Fixed":False}
-
-    # expected yields                                                                                                                                                       
-    configdict["Yields"] = {}
-    configdict["Yields"]["Signal"] = {"2011":{"KPiPi":100000.0}, "2012":{"KPiPi":200000.0},  "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig"]
-    configdict["PlotSettings"]["colors"] = [kBlue+2]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66], 
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bd2DPi/config_Bd2DPi.txt b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bd2DPi/config_Bd2DPi.txt
deleted file mode 100644
index d6c14f5320606433ad6d891c1305701dcc90da73..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bd2DPi/config_Bd2DPi.txt
+++ /dev/null
@@ -1,137 +0,0 @@
-#Bd2DPi KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb/MERGED/
-Bd_Dpi_2011_Dw.root
-Bd_Dpi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bd2DPi KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb/MERGED/
-Bd_Dpi_2012_Dw.root
-Bd_Dpi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#MC FileName KPiPi MD 2011
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb_MC/Bd_D-K+_Dn/BDTG/B2DX_MC_11264011_Dn_BDTG_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb_MC/Bs_Dspi_KKpi_Dn/BDTG/B2DX_MC_13264021_Dn_BDTG_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb_MC/Lb_Lambdacpi_Dn/BDTG/B2DX_MC_15164001_Dn_BDTG_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb_MC/Bd_D-rho+_Dn/BDTG/B2DX_MC_11164401_Dn_BDTG_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb_MC/Bd_Dst-pi+_D-pi0_Dn/BDTG/B2DX_MC_11164404_Dn_BDTG_Bd.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KPiPi MU 2011
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb_MC/Bd_D-K+_Up/BDTG/B2DX_MC_11264011_Up_BDTG_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb_MC/Bs_Dspi_KKpi_Up/BDTG/B2DX_MC_13264021_Up_BDTG_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb_MC/Lb_Lambdacpi_Up/BDTG/B2DX_MC_15164001_Up_BDTG_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb_MC/Bd_D-rho+_Up/BDTG/B2DX_MC_11164401_Up_BDTG_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb_MC/Bd_Dst-pi+_D-pi0_Up/BDTG/B2DX_MC_11164404_Up_BDTG_Bd.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KPiPi MD 2012
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb_MC/Bd_D-K+_Dn/BDTG/B2DX_MC_11264011_Dn_BDTG_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb_MC/Bs_Dspi_KKpi_Dn/BDTG/B2DX_MC_13264021_Dn_BDTG_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb_MC/Lb_Lambdacpi_Dn/BDTG/B2DX_MC_15164001_Dn_BDTG_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb_MC/Bd_D-rho+_Dn/BDTG/B2DX_MC_11164401_Dn_BDTG_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb_MC/Bd_Dst-pi+_D-pi0_Dn/BDTG/B2DX_MC_11164404_Dn_BDTG_Bd.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KPiPi MU 2012
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb_MC/Bd_D-K+_Up/BDTG/B2DX_MC_11264011_Up_BDTG_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb_MC/Bs_Dspi_KKpi_Up/BDTG/B2DX_MC_13264021_Up_BDTG_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb_MC/Lb_Lambdacpi_Up/BDTG/B2DX_MC_15164001_Up_BDTG_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb_MC/Bd_D-rho+_Up/BDTG/B2DX_MC_11164401_Up_BDTG_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb_MC/Bd_Dst-pi+_D-pi0_Up/BDTG/B2DX_MC_11164404_Up_BDTG_Bd.root",
- "TreeName":"DecayTree"}
-###
-
-
-#PIDp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_TightCuts.root
-EffHistos_Reco12_39Mom_Proton_MagUp_TightCuts.root
-###
-
-#PID3
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PID
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PID2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_45678.root
-EffHistos_Reco12_39Mom_MagUp_3456.root
-###
-
-
-#PID Dsp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_DLLpDLLpK.root
-EffHistos_Reco12_39Mom_Proton_MagDown_DLLpDLLpK.root
-###
-
-#PIDp2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_36Mom_Proton_MagDown_DLL.root
-EffHistos_Reco12_36Mom_Proton_MagUp_DLL.root
-###
-
-#RatioDataMC2D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-MomVsnTr_Comp_DPi_Down_hist.root
-MomVsnTr_Comp_DPi_Up_hist.root
-###
-
-#RatioDataMC3D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-PtVsnTrVsP_Comp_DPi_Down_hist.root
-PtVsnTrVsP_Comp_DPi_Up_hist.root
-###
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForMCSplineFit.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForMCSplineFit.py
deleted file mode 100644
index d06d3539774cfe0d0365da3676044c102e4c06bf..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForMCSplineFit.py
+++ /dev/null
@@ -1,39 +0,0 @@
-def getconfig() :
-
-    from Bs2DsKConfigForNominalMassFitFiltered import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Tau_H"] = 1.660999991
-    configdict["Tau_L"] = 1.404999988
-    configdict["Gamma_H"] = 1.0/configdict["Tau_H"]
-    configdict["Gamma_L"] = 1.0/configdict["Tau_L"]
-    configdict["Gammas"]  = (configdict["Gamma_H"] + configdict["Gamma_L"])/2.0
-    configdict["Tau"] = 1.52231245
-    configdict["DeltaGammas"] =  (configdict["Gamma_H"] - configdict["Gamma_L"])
-
-    
-    configdict["DeltaMs"]       = 0.0   # in ps^{-1}
-    configdict["cos"] = 0.0
-    configdict["sin"] = 0.0
-    configdict["sinh"] = 0.0
-
-    configdict["Bins"] = 1000
-
-    
-    configdict["Acceptance"] = { "knots": [0.50, 1.0,  1.5, 2.0, 3.0, 12.0],
-                                 "values": [0.41, 0.603, 0.803, 0.93, 0.98, 1.0, 1.07] }
-#    configdict["Acceptance"] = { "knots": [0.50, 0.75, 1.0,  1.5, 2.0, 3.0, 12.0],
-#                                 "values": [0.41, 0.5, 0.603, 0.803, 0.93, 0.98, 1.0, 1.07] }
-#    configdict["Acceptance"] = { "knots": [0.50, 1.0,  1.5, 2.0, 3.0, 6.0, 12.0],
-#                                 "values": [0.41, 0.603, 0.803, 0.93, 0.98, 0.99, 1.0, 1.07] }
-#    configdict["Acceptance"] = { "knots": [0.50, 0.75, 1.0,  1.5, 2.0, 3.0, 6.0, 12.0],
-#                                 "values": [0.41, 0.5, 0.603, 0.803, 0.93, 0.98, 0.99, 1.0, 1.07] }
-
-    configdict["Resolution"] = {"scaleFactor":1.201}
-
-    configdict["constParams"] = []
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFit.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFit.py
deleted file mode 100644
index cd2b23f9f37c05d09592d931cf4dfbc3f49041b9..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFit.py
+++ /dev/null
@@ -1,203 +0,0 @@
-def getconfig() :
-
-    from Bs2DsKConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]        =  0.6643   # in ps^{-1}                                                                            
-    configdict["DeltaGammas"]   =  0.083
-    configdict["DeltaMs"]       = 17.757   # in ps^{-1}                                                                                                       
-    configdict["StrongPhase"]   = 20. / 180. * pi
-    configdict["WeakPhase"]     = 70./180.*pi
-    configdict["ModLf"]         = 0.372
-    configdict["CPlimit"]       = {"upper":4.0, "lower":-4.0}
-    #configdict["BachelorHypo"] = "Bs2DsK"
-
-    configdict["Asymmetries"] = {"Detection":1.0/100.0,
-                                 "Production":1.1/100.0}
-
-    configdict["ConstrainsForTaggingCalib"] = True
-
-    configdict["UsedResolution"] = "Nominal"
-
-    if configdict["UsedResolution"] == "Nominal":
-        configdict["Resolution"] = { "scaleFactor":{"p0":0.010262, "p1":1.280, "p2":0.0},
-                                     "meanBias":0.0,
-                                     "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                                "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                     "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                    "workName":"workspace",
-                                                    "templateName":"TimeErrorPdf_Bs2DsK"} }
-#nominal
-        configdict["TaggingCalibration"]["OS"] = {"p0": 0.37718, "dp0": 0.0, "p1": 1.1244, "dp1": 0.0,
-                                                  "cov": [ [5.212e-05, 0.0, 0.0002286, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0002286, 0.0, 0.006685, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-        configdict["TaggingCalibration"]["SS"] = {"p0": 0.44119, "dp0": 0.0, "p1": 1.0868, "dp1": 0.0,
-                                                  "cov": [ [2.903e-05, 0.0, 0.0001613, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0001613, 0.0, 0.006101, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.43744, "tagEff":0.63926, "aTagEff":0.0, "use":True}
-#non-zero dp0 dp1
-#        configdict["TaggingCalibration"]["OS"] = {"p0": 0.37718, "dp0": 0.014, "p1": 1.1244, "dp1": 0.066,
-#                                                  "cov": [ [5.212e-05, 0.0, 0.0002286, 0.0],
-#                                                           [0.0, 1.0, 0.0, 0.0],
-#                                                           [0.0002286, 0.0, 0.006685, 0.0],
-#                                                           [0.0, 0.0, 0.0, 1.0]],
-#                                                  "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-#        configdict["TaggingCalibration"]["SS"] = {"p0": 0.44119, "dp0":-0.0163, "p1": 1.0868, "dp1": -0.031,
-#                                                  "cov": [ [2.903e-05, 0.0, 0.0001613, 0.0],
-#                                                           [0.0, 1.0, 0.0, 0.0],
-#                                                           [0.0001613, 0.0, 0.006101, 0.0],
-#                                                           [0.0, 0.0, 0.0, 1.0]],
-#                                                  "average": 0.43744, "tagEff":0.63926, "aTagEff":0.0, "use":True}
-# for running with constrained dp0 dp1
-#        configdict["TaggingCalibration"]["OS"] = {"p0": 0.37718, "dp0": 0.014, "p1": 1.1244, "dp1": 0.066,
-#                                                  "cov": [ [5.212e-05, 0.0, 0.0002286, 0.0],
-#                                                           [0.0, 1.44e-6, 0.0, 7.488e-6],
-#                                                           [0.0002286, 0.0, 0.006685, 0.0],
-#                                                           [0.0, 7.488e-6, 0.0, 1.44e-4]],
-#                                                  "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-#        configdict["TaggingCalibration"]["SS"] = {"p0": 0.44119, "dp0":-0.0163, "p1": 1.0868, "dp1": -0.031,
-#                                                  "cov": [ [2.903e-05, 0.0, 0.0001613, 0.0],
-#                                                           [0.0, 1.369e-05, 0.0, 1.03896e-4],
-#                                                           [0.0001613, 0.0, 0.006101, 0.0],
-#                                                           [0.0, 1.03896e-4, 0.0, 2.704e-3]],
-#                                                  "average": 0.43744, "tagEff":0.63926, "aTagEff":0.0, "use":True}
-
-
-
-
-    if configdict["UsedResolution"] == "SingleGaussian":
-    # Single Gaussian Resolution and corresponding Tagging Parameter                                                                                                                              
-        configdict["Resolution"] = { "scaleFactor":{"p0":0.0, "p1":1.772, 
-                                                    "p2":0.0},
-                                     "meanBias":0.0,
-                                     "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                                "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                     "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                    "workName":"workspace",
-                                                    "templateName":"TimeErrorPdf_Bs2DsPi"} }
-        configdict["TaggingCalibration"]["SS"] = {"p0": 0.43703, "dp0": 0.0, "p1": 1.1314, "dp1": 0.0,
-                                                  "cov": [ [3.217e-05, 0.0, 0.0001613, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0001613, 0.0, 0.006253, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.43744, "tagEff":0.63925, "aTagEff":0.0, "use":True}
-        configdict["TaggingCalibration"]["OS"] = {"p0": 0.36820, "dp0": 0.0, "p1": 1.1993, "dp1": 0.0,
-                                                  "cov": [ [5.878e-05, 0.0, 0.0002331, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0002331, 0.0, 0.0074, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-
-
-    if configdict["UsedResolution"] == "SecondApproach":
-    # Resolution for second approach to check systematics and corresponding Tagging Parameter                                                                                                      
-        configdict["Resolution"] = { "scaleFactor":{"p0":0.000568, "p1":1.243, "p2":0.0},
-                                     "meanBias":0.0,
-                                     "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                                "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                     "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                    "workName":"workspace",
-                                                    "templateName":"TimeErrorPdf_Bs2DsPi"} }
-        configdict["TaggingCalibration"]["SS"] = {"p0": 0.44907, "dp0": 0.0, "p1": 0.95005, "dp1": 0.0,
-                                                  "cov": [ [2.263e-05, 0.0, 0.0001461, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0001461, 0.0, 0.005204, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.43744, "tagEff":0.63926, "aTagEff":0.0, "use":True}
-        configdict["TaggingCalibration"]["OS"] = {"p0": 0.39432, "dp0": 0.0, "p1": 0.97298, "dp1": 0.0,
-                                                  "cov": [ [4.122e-05, 0.0, 0.0002132, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0002132, 0.0, 0.005549, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-
-
-    # Tagging for Single Gaussian
-    #configdict["TaggingCalibration"]["SS"] = {"p0": 0.43703, "dp0": 0.0, "p1": 1.1314, "dp1": 0.0,
-    #                                          "average": 0.43744, "tagEff":0.63925, "aTagEff":0.0, "use":True, }
-    #configdict["TaggingCalibration"]["OS"] = {"p0": 0.36820, "dp0": 0.0, "p1": 1.1993, "dp1": 0.0,
-    #                                          "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-    # Tagging Parameter for the second approach to check systematics                                                                                                                          
-    #configdict["TaggingCalibration"]["SS"] = {"p0": 0.44907, "dp0": 0.0, "p1": 0.95005, "dp1": 0.0,
-    #                                          "average": 0.43744, "tagEff":0.63926, "aTagEff":0.0, "use":True, }
-    #configdict["TaggingCalibration"]["OS"] = {"p0": 0.39432, "dp0": 0.0, "p1": 0.97298, "dp1": 0.0,
-    #                                          "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-    
-    configdict["Acceptance"] = { "knots": [0.50, 1.0,  1.5, 2.0, 3.0, 12.0],
-                                 #"values":[0.347572901037, 0.538426860119, 0.742737602096, 0.919403303754, 1.01804016908, 1.07936031317]
-                                 "values":[0.366414602929, 0.567629823082, 0.782887620988, 0.969392100388, 1.07278188715, 1.15514209375]
-                                 #"values": [0.403856324129, 0.624609402267, 0.851615407148, 1.06363262672, 1.16936200757, 1.27135676682] 
-                                 }
-
-# Additional knot at 0.75
-#    configdict["Acceptance"] = { "knots": [0.50, 0.75, 1.0,  1.5, 2.0, 3.0, 12.0],
-#                                 "values":[0.370284829664, 0.483900633916, 0.596422133286, 0.831048197861, 0.958300794635, 1.07340198419, 1.14741387986]
-#                                 }
-
-# Additional knot at 6
-#    configdict["Acceptance"] = { "knots": [0.50, 1.0,  1.5, 2.0, 3.0, 6.0, 12.0],
-#                                 "values":[0.370710341594, 0.574252350639, 0.793247946774, 0.979409093234, 1.08868777487, 1.11518962111, 1.11620495781]
-#                                 }
-
-# Additional knots at 0.75 and 6
-#    configdict["Acceptance"] = { "knots": [0.50, 0.75,  1.0,  1.5, 2.0, 3.0, 6.0, 12.0],
-#                                 "values":[0.375781859886, 0.491211389496, 0.604395388273, 0.844577216222, 0.969644585897, 1.09378017785, 1.11186353652, 1.12116231304]
-#                                 }
-
-
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas_Bs2DsK')
-    configdict["constParams"].append('deltaGammas_Bs2DsK')
-    #configdict["constParams"].append('C_Bs2DsPi')
-    #configdict["constParams"].append('Cbar_Bs2DsPi')
-    #configdict["constParams"].append('S_Bs2DsPi')
-    #configdict["constParams"].append('Sbar_Bs2DsPi')
-    #configdict["constParams"].append('D_Bs2DsPi')
-    #configdict["constParams"].append('Dbar_Bs2DsPi')
-    configdict["constParams"].append('tagEffSig')
-    configdict["constParams"].append('DeltaMs_Bs2DsK')
-    configdict["constParams"].append('var1')
-    configdict["constParams"].append('var2')
-    configdict["constParams"].append('var3')
-    configdict["constParams"].append('var4')
-    configdict["constParams"].append('var5')
-    configdict["constParams"].append('var6')
-#    configdict["constParams"].append('var7')
-#    configdict["constParams"].append('var8')
-    configdict["constParams"].append('tagEff_OS')
-    configdict["constParams"].append('tagEff_SS')
-    configdict["constParams"].append('tagEff_Both')
-    configdict["constParams"].append('aTagEff_OS')
-    configdict["constParams"].append('aTagEff_SS')
-    configdict["constParams"].append('aTagEff_Both')
-    if configdict["ConstrainsForTaggingCalib"] == False:
-        configdict["constParams"].append('p0_OS')
-        configdict["constParams"].append('p0_SS')
-        configdict["constParams"].append('p1_OS')
-        configdict["constParams"].append('p1_SS')
-    configdict["constParams"].append('dp0_OS')
-    configdict["constParams"].append('dp0_SS')
-    configdict["constParams"].append('dp1_OS')
-    configdict["constParams"].append('dp1_SS')
-    configdict["constParams"].append('p0_mean_OS')
-    configdict["constParams"].append('p0_mean_SS')
-    configdict["constParams"].append('p1_mean_OS')
-    configdict["constParams"].append('p1_mean_SS')
-    configdict["constParams"].append('dp0_mean_OS')
-    configdict["constParams"].append('dp0_mean_SS')
-    configdict["constParams"].append('dp1_mean_OS')
-    configdict["constParams"].append('dp1_mean_SS')
-    configdict["constParams"].append('average_OS')
-    configdict["constParams"].append('average_SS')
-
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFit2011.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFit2011.py
deleted file mode 100644
index c5070b9df620552e1ecd8758d2f00a968220460e..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFit2011.py
+++ /dev/null
@@ -1,70 +0,0 @@
-def getconfig() :
-
-    from Bs2DsKConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]        =  0.6643   # in ps^{-1}                                                                                                                                       
-    configdict["DeltaGammas"]   =  -0.083
-    configdict["DeltaMs"]       = 17.757   # in ps^{-1}                                                                                                                                         
-    configdict["StrongPhase"]   = 20. / 180. * pi
-    configdict["WeakPhase"]     = 70./180.*pi
-    configdict["ModLf"]         = 0.372
-    configdict["CPlimit"]       = {"upper":3.0, "lower":-3.0}
-
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.44119, "dp0": 0.0, "p1": 1.0868, "dp1": 0.0,
-                                              "average": 0.43744, "tagEff":0.63926, "aTagEff":0.0, "use":True, }
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.37718, "dp0": 0.0, "p1": 1.1244, "dp1": 0.0,
-                                              "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-
-    configdict["Acceptance"] = { "knots": [0.50, 1.0,  1.5, 2.0, 3.0, 12.0],
-                                 "values": [0.434637713479, 0.687579170801, 0.862646488632, 1.17629768823, 1.26614833221, 1.36250113277] }
-
-    configdict["Resolution"] = { "scaleFactor":{"p0":0.010262, "p1":1.280, "p2":0.0},
-                                 "meanBias":0.0,
-                                 "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                            "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                 "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                "workName":"workspace",
-                                                "templateName":"TimeErrorPdf_Bs2DsK"} }
-
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas_Bs2DsK')
-    configdict["constParams"].append('deltaGammas_Bs2DsK')
-    #configdict["constParams"].append('C_Bs2DsPi')
-    #configdict["constParams"].append('Cbar_Bs2DsPi')
-    #configdict["constParams"].append('S_Bs2DsPi')
-    #configdict["constParams"].append('Sbar_Bs2DsPi')
-    #configdict["constParams"].append('D_Bs2DsPi')
-    #configdict["constParams"].append('Dbar_Bs2DsPi')
-    configdict["constParams"].append('tagEffSig')
-    configdict["constParams"].append('DeltaMs_Bs2DsK')
-    configdict["constParams"].append('var1')
-    configdict["constParams"].append('var2')
-    configdict["constParams"].append('var3')
-    configdict["constParams"].append('var4')
-    configdict["constParams"].append('var5')
-    configdict["constParams"].append('var6')
-    configdict["constParams"].append('tagEff_OS')
-    configdict["constParams"].append('tagEff_SS')
-    configdict["constParams"].append('tagEff_Both')
-    configdict["constParams"].append('aTagEff_OS')
-    configdict["constParams"].append('aTagEff_SS')
-    configdict["constParams"].append('aTagEff_Both')
-    configdict["constParams"].append('p0_OS')
-    configdict["constParams"].append('p0_SS')
-    configdict["constParams"].append('p1_OS')
-    configdict["constParams"].append('p1_SS')
-    configdict["constParams"].append('dp0_OS')
-    configdict["constParams"].append('dp0_SS')
-    configdict["constParams"].append('dp1_OS')
-    configdict["constParams"].append('dp1_SS')
-    configdict["constParams"].append('average_OS')
-    configdict["constParams"].append('average_SS')
-
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFit2012.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFit2012.py
deleted file mode 100644
index 9e07c1b7aef4ad7ad91fc3ed14dca49bf7e16f3f..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFit2012.py
+++ /dev/null
@@ -1,70 +0,0 @@
-def getconfig() :
-
-    from Bs2DsKConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]        =  0.6643   # in ps^{-1}                                                                                                                                       
-    configdict["DeltaGammas"]   =  -0.083
-    configdict["DeltaMs"]       = 17.757   # in ps^{-1}                                                                                                                                         
-    configdict["StrongPhase"]   = 20. / 180. * pi
-    configdict["WeakPhase"]     = 70./180.*pi
-    configdict["ModLf"]         = 0.372
-    configdict["CPlimit"]       = {"upper":4.0, "lower":-4.0}
-
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.44119, "dp0": 0.0, "p1": 1.0868, "dp1": 0.0,
-                                              "average": 0.43744, "tagEff":0.63926, "aTagEff":0.0, "use":True, }
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.37718, "dp0": 0.0, "p1": 1.1244, "dp1": 0.0,
-                                              "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-
-    configdict["Acceptance"] = { "knots": [0.50, 1.0,  1.5, 2.0, 3.0, 12.0],
-                                 "values": [0.440485001978, 0.701848088573, 0.892641762232, 1.18167586719, 1.30492220894, 1.42192286781] }
-
-    configdict["Resolution"] = { "scaleFactor":{"p0":0.010262, "p1":1.280, "p2":0.0},
-                                 "meanBias":0.0,
-                                 "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                            "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                 "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                "workName":"workspace",
-                                                "templateName":"TimeErrorPdf_Bs2DsK"} }
-
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas_Bs2DsK')
-    configdict["constParams"].append('deltaGammas_Bs2DsK')
-    #configdict["constParams"].append('C_Bs2DsPi')
-    #configdict["constParams"].append('Cbar_Bs2DsPi')
-    #configdict["constParams"].append('S_Bs2DsPi')
-    #configdict["constParams"].append('Sbar_Bs2DsPi')
-    #configdict["constParams"].append('D_Bs2DsPi')
-    #configdict["constParams"].append('Dbar_Bs2DsPi')
-    configdict["constParams"].append('tagEffSig')
-    configdict["constParams"].append('DeltaMs_Bs2DsK')
-    configdict["constParams"].append('var1')
-    configdict["constParams"].append('var2')
-    configdict["constParams"].append('var3')
-    configdict["constParams"].append('var4')
-    configdict["constParams"].append('var5')
-    configdict["constParams"].append('var6')
-    configdict["constParams"].append('tagEff_OS')
-    configdict["constParams"].append('tagEff_SS')
-    configdict["constParams"].append('tagEff_Both')
-    configdict["constParams"].append('aTagEff_OS')
-    configdict["constParams"].append('aTagEff_SS')
-    configdict["constParams"].append('aTagEff_Both')
-    configdict["constParams"].append('p0_OS')
-    configdict["constParams"].append('p0_SS')
-    configdict["constParams"].append('p1_OS')
-    configdict["constParams"].append('p1_SS')
-    configdict["constParams"].append('dp0_OS')
-    configdict["constParams"].append('dp0_SS')
-    configdict["constParams"].append('dp1_OS')
-    configdict["constParams"].append('dp1_SS')
-    configdict["constParams"].append('average_OS')
-    configdict["constParams"].append('average_SS')
-
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFitBDTG1.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFitBDTG1.py
deleted file mode 100644
index 8762d9600001b7f926359fcbc7c0a25968a953f5..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFitBDTG1.py
+++ /dev/null
@@ -1,70 +0,0 @@
-def getconfig() :
-
-    from Bs2DsKConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]        =  0.6643   # in ps^{-1}                                                                                                                                       
-    configdict["DeltaGammas"]   =  -0.083
-    configdict["DeltaMs"]       = 17.757   # in ps^{-1}                                                                                                                                         
-    configdict["StrongPhase"]   = 20. / 180. * pi
-    configdict["WeakPhase"]     = 70./180.*pi
-    configdict["ModLf"]         = 0.372
-    configdict["CPlimit"]       = {"upper":4.0, "lower":-4.0}
-
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.44119, "dp0": 0.0, "p1": 1.0868, "dp1": 0.0,
-                                              "average": 0.43744, "tagEff":0.63926, "aTagEff":0.0, "use":True, }
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.37718, "dp0": 0.0, "p1": 1.1244, "dp1": 0.0,
-                                              "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-
-    configdict["Acceptance"] = { "knots": [0.50, 1.0,  1.5, 2.0, 3.0, 12.0],
-                                 "values": [1.28131015802, 1.79539469803, 2.11461828674, 2.1368141734, 1.97954298263, 0.714023177051] }
-
-    configdict["Resolution"] = { "scaleFactor":{"p0":0.010262, "p1":1.280, "p2":0.0},
-                                 "meanBias":0.0,
-                                 "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                            "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                 "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                "workName":"workspace",
-                                                "templateName":"TimeErrorPdf_Bs2DsK"} }
-
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas_Bs2DsK')
-    configdict["constParams"].append('deltaGammas_Bs2DsK')
-    #configdict["constParams"].append('C_Bs2DsPi')
-    #configdict["constParams"].append('Cbar_Bs2DsPi')
-    #configdict["constParams"].append('S_Bs2DsPi')
-    #configdict["constParams"].append('Sbar_Bs2DsPi')
-    #configdict["constParams"].append('D_Bs2DsPi')
-    #configdict["constParams"].append('Dbar_Bs2DsPi')
-    configdict["constParams"].append('tagEffSig')
-    configdict["constParams"].append('DeltaMs_Bs2DsK')
-    configdict["constParams"].append('var1')
-    configdict["constParams"].append('var2')
-    configdict["constParams"].append('var3')
-    configdict["constParams"].append('var4')
-    configdict["constParams"].append('var5')
-    configdict["constParams"].append('var6')
-    configdict["constParams"].append('tagEff_OS')
-    configdict["constParams"].append('tagEff_SS')
-    configdict["constParams"].append('tagEff_Both')
-    configdict["constParams"].append('aTagEff_OS')
-    configdict["constParams"].append('aTagEff_SS')
-    configdict["constParams"].append('aTagEff_Both')
-    configdict["constParams"].append('p0_OS')
-    configdict["constParams"].append('p0_SS')
-    configdict["constParams"].append('p1_OS')
-    configdict["constParams"].append('p1_SS')
-    configdict["constParams"].append('dp0_OS')
-    configdict["constParams"].append('dp0_SS')
-    configdict["constParams"].append('dp1_OS')
-    configdict["constParams"].append('dp1_SS')
-    configdict["constParams"].append('average_OS')
-    configdict["constParams"].append('average_SS')
-
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFitBDTG2.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFitBDTG2.py
deleted file mode 100644
index ef83ae2aea5a6921df3e2c3c45cb567ecab8548d..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFitBDTG2.py
+++ /dev/null
@@ -1,70 +0,0 @@
-def getconfig() :
-
-    from Bs2DsKConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]        =  0.6643   # in ps^{-1}                                                                                                                                       
-    configdict["DeltaGammas"]   =  -0.083
-    configdict["DeltaMs"]       = 17.757   # in ps^{-1}                                                                                                                                         
-    configdict["StrongPhase"]   = 20. / 180. * pi
-    configdict["WeakPhase"]     = 70./180.*pi
-    configdict["ModLf"]         = 0.372
-    configdict["CPlimit"]       = {"upper":4.0, "lower":-4.0}
-
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.44119, "dp0": 0.0, "p1": 1.0868, "dp1": 0.0,
-                                              "average": 0.43744, "tagEff":0.63926, "aTagEff":0.0, "use":True, }
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.37718, "dp0": 0.0, "p1": 1.1244, "dp1": 0.0,
-                                              "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-
-    configdict["Acceptance"] = { "knots": [0.50, 1.0,  1.5, 2.0, 3.0, 12.0],
-                                 "values": [0.102920445288, 0.218243764724, 0.358423896429, 0.629805556158, 0.842469265821, 1.40253689537] }
-
-    configdict["Resolution"] = { "scaleFactor":{"p0":0.010262, "p1":1.280, "p2":0.0},
-                                 "meanBias":0.0,
-                                 "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                            "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                 "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                "workName":"workspace",
-                                                "templateName":"TimeErrorPdf_Bs2DsK"} }
-
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas_Bs2DsK')
-    configdict["constParams"].append('deltaGammas_Bs2DsK')
-    #configdict["constParams"].append('C_Bs2DsPi')
-    #configdict["constParams"].append('Cbar_Bs2DsPi')
-    #configdict["constParams"].append('S_Bs2DsPi')
-    #configdict["constParams"].append('Sbar_Bs2DsPi')
-    #configdict["constParams"].append('D_Bs2DsPi')
-    #configdict["constParams"].append('Dbar_Bs2DsPi')
-    configdict["constParams"].append('tagEffSig')
-    configdict["constParams"].append('DeltaMs_Bs2DsK')
-    configdict["constParams"].append('var1')
-    configdict["constParams"].append('var2')
-    configdict["constParams"].append('var3')
-    configdict["constParams"].append('var4')
-    configdict["constParams"].append('var5')
-    configdict["constParams"].append('var6')
-    configdict["constParams"].append('tagEff_OS')
-    configdict["constParams"].append('tagEff_SS')
-    configdict["constParams"].append('tagEff_Both')
-    configdict["constParams"].append('aTagEff_OS')
-    configdict["constParams"].append('aTagEff_SS')
-    configdict["constParams"].append('aTagEff_Both')
-    configdict["constParams"].append('p0_OS')
-    configdict["constParams"].append('p0_SS')
-    configdict["constParams"].append('p1_OS')
-    configdict["constParams"].append('p1_SS')
-    configdict["constParams"].append('dp0_OS')
-    configdict["constParams"].append('dp0_SS')
-    configdict["constParams"].append('dp1_OS')
-    configdict["constParams"].append('dp1_SS')
-    configdict["constParams"].append('average_OS')
-    configdict["constParams"].append('average_SS')
-
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFitBsP1.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFitBsP1.py
deleted file mode 100644
index 88b36b1bad5bde25764ef432aee8f40643ac7f94..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFitBsP1.py
+++ /dev/null
@@ -1,70 +0,0 @@
-def getconfig() :
-
-    from Bs2DsKConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]        =  0.6643   # in ps^{-1}                                                                                                                                       
-    configdict["DeltaGammas"]   =  -0.083
-    configdict["DeltaMs"]       = 17.757   # in ps^{-1}                                                                                                                                         
-    configdict["StrongPhase"]   = 20. / 180. * pi
-    configdict["WeakPhase"]     = 70./180.*pi
-    configdict["ModLf"]         = 0.372
-    configdict["CPlimit"]       = {"upper":4.0, "lower":-4.0}
-
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.44119, "dp0": 0.0, "p1": 1.0868, "dp1": 0.0,
-                                              "average": 0.43744, "tagEff":0.63926, "aTagEff":0.0, "use":True, }
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.37718, "dp0": 0.0, "p1": 1.1244, "dp1": 0.0,
-                                             "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-    
-    configdict["Acceptance"] = { "knots": [0.50, 1.0,  1.5, 2.0, 3.0, 12.0],
-                                 "values": [0.324776341811, 0.518323515845, 0.799578649032, 0.984213725808, 1.11690499935, 1.19973875192] }
-
-    configdict["Resolution"] = { "scaleFactor":{"p0":0.010262, "p1":1.280, "p2":0.0},
-                                 "meanBias":0.0,
-                                 "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                            "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                 "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                "workName":"workspace",
-                                                "templateName":"TimeErrorPdf_Bs2DsK"} }
-
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas_Bs2DsK')
-    configdict["constParams"].append('deltaGammas_Bs2DsK')
-    #configdict["constParams"].append('C_Bs2DsPi')
-    #configdict["constParams"].append('Cbar_Bs2DsPi')
-    #configdict["constParams"].append('S_Bs2DsPi')
-    #configdict["constParams"].append('Sbar_Bs2DsPi')
-    #configdict["constParams"].append('D_Bs2DsPi')
-    #configdict["constParams"].append('Dbar_Bs2DsPi')
-    configdict["constParams"].append('tagEffSig')
-    configdict["constParams"].append('DeltaMs_Bs2DsK')
-    configdict["constParams"].append('var1')
-    configdict["constParams"].append('var2')
-    configdict["constParams"].append('var3')
-    configdict["constParams"].append('var4')
-    configdict["constParams"].append('var5')
-    configdict["constParams"].append('var6')
-    configdict["constParams"].append('tagEff_OS')
-    configdict["constParams"].append('tagEff_SS')
-    configdict["constParams"].append('tagEff_Both')
-    configdict["constParams"].append('aTagEff_OS')
-    configdict["constParams"].append('aTagEff_SS')
-    configdict["constParams"].append('aTagEff_Both')
-    configdict["constParams"].append('p0_OS')
-    configdict["constParams"].append('p0_SS')
-    configdict["constParams"].append('p1_OS')
-    configdict["constParams"].append('p1_SS')
-    configdict["constParams"].append('dp0_OS')
-    configdict["constParams"].append('dp0_SS')
-    configdict["constParams"].append('dp1_OS')
-    configdict["constParams"].append('dp1_SS')
-    configdict["constParams"].append('average_OS')
-    configdict["constParams"].append('average_SS')
-
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFitBsP2.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFitBsP2.py
deleted file mode 100644
index 4c3c188ac1e4525ce53040f96f3a83dfd4de5757..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFitBsP2.py
+++ /dev/null
@@ -1,70 +0,0 @@
-def getconfig() :
-
-    from Bs2DsKConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]        =  0.6643   # in ps^{-1}                                                                                                                                       
-    configdict["DeltaGammas"]   =  -0.083
-    configdict["DeltaMs"]       = 17.757   # in ps^{-1}                                                                                                                                         
-    configdict["StrongPhase"]   = 20. / 180. * pi
-    configdict["WeakPhase"]     = 70./180.*pi
-    configdict["ModLf"]         = 0.372
-    configdict["CPlimit"]       = {"upper":4.0, "lower":-4.0}
-
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.44119, "dp0": 0.0, "p1": 1.0868, "dp1": 0.0,
-                                              "average": 0.43744, "tagEff":0.63926, "aTagEff":0.0, "use":True, }
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.37718, "dp0": 0.0, "p1": 1.1244, "dp1": 0.0,
-                                              "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-
-    configdict["Acceptance"] = { "knots": [0.50, 1.0,  1.5, 2.0, 3.0, 12.0],
-                                 "values": [0.604584943937, 0.879661486039, 0.982438930056, 1.24202614231, 1.29358621484, 1.43622811654] }
-
-    configdict["Resolution"] = { "scaleFactor":{"p0":0.010262, "p1":1.280, "p2":0.0},
-                                 "meanBias":0.0,
-                                 "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                            "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                 "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                "workName":"workspace",
-                                                "templateName":"TimeErrorPdf_Bs2DsK"} }
-
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas_Bs2DsK')
-    configdict["constParams"].append('deltaGammas_Bs2DsK')
-    #configdict["constParams"].append('C_Bs2DsPi')
-    #configdict["constParams"].append('Cbar_Bs2DsPi')
-    #configdict["constParams"].append('S_Bs2DsPi')
-    #configdict["constParams"].append('Sbar_Bs2DsPi')
-    #configdict["constParams"].append('D_Bs2DsPi')
-    #configdict["constParams"].append('Dbar_Bs2DsPi')
-    configdict["constParams"].append('tagEffSig')
-    configdict["constParams"].append('DeltaMs_Bs2DsK')
-    configdict["constParams"].append('var1')
-    configdict["constParams"].append('var2')
-    configdict["constParams"].append('var3')
-    configdict["constParams"].append('var4')
-    configdict["constParams"].append('var5')
-    configdict["constParams"].append('var6')
-    configdict["constParams"].append('tagEff_OS')
-    configdict["constParams"].append('tagEff_SS')
-    configdict["constParams"].append('tagEff_Both')
-    configdict["constParams"].append('aTagEff_OS')
-    configdict["constParams"].append('aTagEff_SS')
-    configdict["constParams"].append('aTagEff_Both')
-    configdict["constParams"].append('p0_OS')
-    configdict["constParams"].append('p0_SS')
-    configdict["constParams"].append('p1_OS')
-    configdict["constParams"].append('p1_SS')
-    configdict["constParams"].append('dp0_OS')
-    configdict["constParams"].append('dp0_SS')
-    configdict["constParams"].append('dp1_OS')
-    configdict["constParams"].append('dp1_SS')
-    configdict["constParams"].append('average_OS')
-    configdict["constParams"].append('average_SS')
-
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFitDown.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFitDown.py
deleted file mode 100644
index c1f227c01697445a65e74cf92bdc7cd5d66367e9..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFitDown.py
+++ /dev/null
@@ -1,70 +0,0 @@
-def getconfig() :
-
-    from Bs2DsKConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]        =  0.6643   # in ps^{-1}                                                                                                                                       
-    configdict["DeltaGammas"]   =  -0.083
-    configdict["DeltaMs"]       = 17.757   # in ps^{-1}                                                                                                                                         
-    configdict["StrongPhase"]   = 20. / 180. * pi
-    configdict["WeakPhase"]     = 70./180.*pi
-    configdict["ModLf"]         = 0.372
-    configdict["CPlimit"]       = {"upper":4.0, "lower":-4.0}
-
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.44119, "dp0": 0.0, "p1": 1.0868, "dp1": 0.0,
-                                              "average": 0.43744, "tagEff":0.63926, "aTagEff":0.0, "use":True, }
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.37718, "dp0": 0.0, "p1": 1.1244, "dp1": 0.0,
-                                              "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-    
-    configdict["Acceptance"] = { "knots": [0.50, 1.0,  1.5, 2.0, 3.0, 12.0],
-                                 "values": [0.364502754135, 0.561533096166, 0.797215677911, 0.97602040509, 1.10591561386, 1.19866946011] }
-
-    configdict["Resolution"] = { "scaleFactor":{"p0":0.010262, "p1":1.280, "p2":0.0},
-                                 "meanBias":0.0,
-                                 "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                            "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                 "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                "workName":"workspace",
-                                                "templateName":"TimeErrorPdf_Bs2DsK"} }
-
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas_Bs2DsK')
-    configdict["constParams"].append('deltaGammas_Bs2DsK')
-    #configdict["constParams"].append('C_Bs2DsPi')
-    #configdict["constParams"].append('Cbar_Bs2DsPi')
-    #configdict["constParams"].append('S_Bs2DsPi')
-    #configdict["constParams"].append('Sbar_Bs2DsPi')
-    #configdict["constParams"].append('D_Bs2DsPi')
-    #configdict["constParams"].append('Dbar_Bs2DsPi')
-    configdict["constParams"].append('tagEffSig')
-    configdict["constParams"].append('DeltaMs_Bs2DsK')
-    configdict["constParams"].append('var1')
-    configdict["constParams"].append('var2')
-    configdict["constParams"].append('var3')
-    configdict["constParams"].append('var4')
-    configdict["constParams"].append('var5')
-    configdict["constParams"].append('var6')
-    configdict["constParams"].append('tagEff_OS')
-    configdict["constParams"].append('tagEff_SS')
-    configdict["constParams"].append('tagEff_Both')
-    configdict["constParams"].append('aTagEff_OS')
-    configdict["constParams"].append('aTagEff_SS')
-    configdict["constParams"].append('aTagEff_Both')
-    configdict["constParams"].append('p0_OS')
-    configdict["constParams"].append('p0_SS')
-    configdict["constParams"].append('p1_OS')
-    configdict["constParams"].append('p1_SS')
-    configdict["constParams"].append('dp0_OS')
-    configdict["constParams"].append('dp0_SS')
-    configdict["constParams"].append('dp1_OS')
-    configdict["constParams"].append('dp1_SS')
-    configdict["constParams"].append('average_OS')
-    configdict["constParams"].append('average_SS')
-
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFitUp.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFitUp.py
deleted file mode 100644
index e91652a38450144677a79c7686c662c6d1ac4286..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPFitUp.py
+++ /dev/null
@@ -1,70 +0,0 @@
-def getconfig() :
-
-    from Bs2DsKConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]        =  0.6643   # in ps^{-1}                                                                                                                                       
-    configdict["DeltaGammas"]   =  -0.083
-    configdict["DeltaMs"]       = 17.757   # in ps^{-1}                                                                                                                                         
-    configdict["StrongPhase"]   = 20. / 180. * pi
-    configdict["WeakPhase"]     = 70./180.*pi
-    configdict["ModLf"]         = 0.372
-    configdict["CPlimit"]       = {"upper":4.0, "lower":-4.0}
-
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.44119, "dp0": 0.0, "p1": 1.0868, "dp1": 0.0,
-                                              "average": 0.43744, "tagEff":0.63926, "aTagEff":0.0, "use":True, }
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.37718, "dp0": 0.0, "p1": 1.1244, "dp1": 0.0,
-                                              "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-
-    configdict["Acceptance"] = { "knots": [0.50, 1.0,  1.5, 2.0, 3.0, 12.0],
-                                 "values": [0.421821807894, 0.66275683833, 0.882678296092, 1.14535785774, 1.23269197415, 1.35665995008] }
-
-    configdict["Resolution"] = { "scaleFactor":{"p0":0.010262, "p1":1.280, "p2":0.0},
-                                 "meanBias":0.0,
-                                 "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                            "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                 "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                "workName":"workspace",
-                                                "templateName":"TimeErrorPdf_Bs2DsK"} }
-
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas_Bs2DsK')
-    configdict["constParams"].append('deltaGammas_Bs2DsK')
-    #configdict["constParams"].append('C_Bs2DsPi')
-    #configdict["constParams"].append('Cbar_Bs2DsPi')
-    #configdict["constParams"].append('S_Bs2DsPi')
-    #configdict["constParams"].append('Sbar_Bs2DsPi')
-    #configdict["constParams"].append('D_Bs2DsPi')
-    #configdict["constParams"].append('Dbar_Bs2DsPi')
-    configdict["constParams"].append('tagEffSig')
-    configdict["constParams"].append('DeltaMs_Bs2DsK')
-    configdict["constParams"].append('var1')
-    configdict["constParams"].append('var2')
-    configdict["constParams"].append('var3')
-    configdict["constParams"].append('var4')
-    configdict["constParams"].append('var5')
-    configdict["constParams"].append('var6')
-    configdict["constParams"].append('tagEff_OS')
-    configdict["constParams"].append('tagEff_SS')
-    configdict["constParams"].append('tagEff_Both')
-    configdict["constParams"].append('aTagEff_OS')
-    configdict["constParams"].append('aTagEff_SS')
-    configdict["constParams"].append('aTagEff_Both')
-    configdict["constParams"].append('p0_OS')
-    configdict["constParams"].append('p0_SS')
-    configdict["constParams"].append('p1_OS')
-    configdict["constParams"].append('p1_SS')
-    configdict["constParams"].append('dp0_OS')
-    configdict["constParams"].append('dp0_SS')
-    configdict["constParams"].append('dp1_OS')
-    configdict["constParams"].append('dp1_SS')
-    configdict["constParams"].append('average_OS')
-    configdict["constParams"].append('average_SS')
-
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPVMC.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPVMC.py
deleted file mode 100644
index 45aa53c3c7e5a6eb2502d4466806c91ad7282c8d..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalCPVMC.py
+++ /dev/null
@@ -1,103 +0,0 @@
-def getconfig() :
-
-    from Bs2DsKConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-    
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]        =  0.661376   # in ps^{-1}
-    configdict["DeltaGammas"]   =  -0.08068783069
-    configdict["DeltaMs"]       = 17.757   # in ps^{-1}
-    configdict["TagEffSig"]     = 0.403
-    configdict["TagOmegaSig"]   = 0.391
-    configdict["StrongPhase"]   = 10. / 180. * pi
-    configdict["WeakPhase"]     = 71.121/180.*pi
-    configdict["ModLf"]         = 0.37
-    configdict["CPlimit"]       = {"upper":4.0, "lower":-4.0} 
-
-    configdict["TaggingCalibration"] = {}
-
-    configdict["ConstrainsForTaggingCalib"] = False
-    configdict["FixAcceptance"] = True
-
-    # Nominal MC Resolution and corresponding tagging parameters (DsK)
-    configdict["Resolution"] = { "scaleFactor":{"p0":0.0, "p1":1.201, "p2":0.0},
-                                 "meanBias":0.0,
-                                 "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                            "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                 "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                "workName":"workspace",
-                                                "templateName":"TimeErrorPdf_Bs2DsK"} }
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4276, "dp0": 0.0, "p1": 1.184, "dp1": 0.0,
-                                              "cov": [ [1.0, 0.0, 0.0, 0.0],
-                                                       [0.0, 1.0, 0.0, 0.0],
-                                                       [0.0, 0.0, 1.0, 0.0],
-                                                       [0.0, 0.0, 0.0, 1.0]],
-#                                              "average": 0.4311, "tagEff": 0.6801705055, "aTagEff":0.0, "use":True}
-                                              "average": 0.4311, "tagEff":0.63926, "aTagEff":0.0, "use":True}
-#                                              "average": 0.4311, "tagEff":0.70123, "aTagEff":0.0, "use":True}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3604, "dp0": 0.0, "p1": 0.914, "dp1": 0.0,
-                                              "cov": [ [1.0, 0.0, 0.0, 0.0],
-                                                       [0.0, 1.0, 0.0, 0.0],
-                                                       [0.0, 0.0, 1.0, 0.0],
-                                                       [0.0, 0.0, 0.0, 1.0]],
-#                                              "average": 0.3597, "tagEff":0.3766009593, "aTagEff":0.0, "use":True}
-                                              "average": 0.3597, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-#                                              "average": 0.3597, "tagEff":0.39425, "aTagEff":0.0, "use":True}
-
-
-#    configdict["Acceptance"] = { "knots": [0.50, 0.75, 1.0, 1.5, 2.0, 3.0, 12.0],
-#                                 "values": [5.3341e-01,6.0771e-01,8.0080e-01,9.9213e-01,1.1265e+00,1.2121e+00,1.2823e+00] }
-    configdict["Acceptance"] = { "knots": [0.50, 1.0, 1.5, 2.0, 3.0, 12.0],
-                                 "values": [4.7115e-01,6.6919e-01,9.3061e-01,1.0547e+00,1.1660e+00,1.2518e+00] }
-
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas_Bs2DsK')
-    configdict["constParams"].append('deltaGammas_Bs2DsK')
-    configdict["constParams"].append('DeltaMs_Bs2DsK')
-#    configdict["constParams"].append('C_Bs2DsK')
-#    configdict["constParams"].append('Cbar_Bs2DsK')
-#    configdict["constParams"].append('S_Bs2DsK')
-#    configdict["constParams"].append('Sbar_Bs2DsK')
-#    configdict["constParams"].append('D_Bs2DsK')
-#    configdict["constParams"].append('Dbar_Bs2DsK')
-    configdict["constParams"].append('tagEff_OS')
-    configdict["constParams"].append('tagEff_SS')
-    configdict["constParams"].append('aTagEff_OS')
-    configdict["constParams"].append('aTagEff_SS')
-    if configdict["FixAcceptance"] == True:
-        configdict["constParams"].append('var1')
-        configdict["constParams"].append('var2')
-        configdict["constParams"].append('var3')
-        configdict["constParams"].append('var4')
-        configdict["constParams"].append('var5')
-        configdict["constParams"].append('var6')
-        configdict["constParams"].append('var7')
-    if configdict["ConstrainsForTaggingCalib"] == False:
-        configdict["constParams"].append('p0_OS')
-        configdict["constParams"].append('p0_SS')
-        configdict["constParams"].append('p1_OS')
-        configdict["constParams"].append('p1_SS')
-    configdict["constParams"].append('dp0_OS')
-    configdict["constParams"].append('dp0_SS')
-    configdict["constParams"].append('dp1_OS')
-    configdict["constParams"].append('dp1_SS')
-    configdict["constParams"].append('p0_mean_OS')
-    configdict["constParams"].append('p0_mean_SS')
-    configdict["constParams"].append('p1_mean_OS')
-    configdict["constParams"].append('p1_mean_SS')
-    configdict["constParams"].append('dp0_mean_OS')
-    configdict["constParams"].append('dp0_mean_SS')
-    configdict["constParams"].append('dp1_mean_OS')
-    configdict["constParams"].append('dp1_mean_SS')
-    configdict["constParams"].append('average_OS')
-    configdict["constParams"].append('average_SS')
-
-
-
-
-    #configdict["constParams"].append('DeltaMs')
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMC.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMC.py
deleted file mode 100644
index bc6d5b8e697a263cd2f36f1995d14242091a8252..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMC.py
+++ /dev/null
@@ -1,104 +0,0 @@
-def getconfig() :
-
-    from Bs2DsKConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-    
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]        =  0.6568953699   # in ps^{-1}
-    configdict["DeltaGammas"]   =  -0.1096968152
-    configdict["DeltaMs"]       = 17.799999999   # in ps^{-1}
-    configdict["TagEffSig"]     = 0.403
-    configdict["TagOmegaSig"]   = 0.391
-    configdict["StrongPhase"]   = 20. / 180. * pi
-    configdict["WeakPhase"]     = 70./180.*pi
-    configdict["ModLf"]         = 0.372
-    configdict["CPlimit"]       = {"upper":4.0, "lower":-4.0} 
-
-    configdict["TaggingCalibration"] = {}
-
-    configdict["ConstrainsForTaggingCalib"] = False
-    configdict["FixAcceptance"] = True
-
-    configdict["Asymmetries"] = {"Detection":0.0,
-                                 "Production":0.0}
-
-
-    # Nominal MC Resolution and corresponding tagging parameters (DsK)
-    configdict["Resolution"] = { "scaleFactor":{"p0":0.0, "p1":1.201, "p2":0.0},
-                                 "meanBias":0.0,
-                                 "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                            "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                 "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                "workName":"workspace",
-                                                "templateName":"TimeErrorPdf_Bs2DsK"} }
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4276, "dp0": 0.0, "p1": 1.184, "dp1": 0.0,
-                                              "cov": [ [1.0, 0.0, 0.0, 0.0],
-                                                       [0.0, 1.0, 0.0, 0.0],
-                                                       [0.0, 0.0, 1.0, 0.0],
-                                                       [0.0, 0.0, 0.0, 1.0]],
-                                              "average": 0.4311, "tagEff": 0.6801705055, "aTagEff":0.0, "use":True}
-#                                              "average": 0.4311, "tagEff":0.63926, "aTagEff":0.0, "use":True}
-#                                              "average": 0.4311, "tagEff":0.70123, "aTagEff":0.0, "use":True}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3604, "dp0": 0.0, "p1": 0.914, "dp1": 0.0,
-                                              "cov": [ [1.0, 0.0, 0.0, 0.0],
-                                                       [0.0, 1.0, 0.0, 0.0],
-                                                       [0.0, 0.0, 1.0, 0.0],
-                                                       [0.0, 0.0, 0.0, 1.0]],
-                                              "average": 0.3597, "tagEff":0.3766009593, "aTagEff":0.0, "use":True}
-#                                              "average": 0.3597, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-#                                              "average": 0.3597, "tagEff":0.39425, "aTagEff":0.0, "use":True}
-
-
-    configdict["Acceptance"] = { "knots": [0.50, 1.0,  1.5, 2.0, 3.0, 12.0],
-                                 "values": [4.2031e-01,6.0903e-01,8.1647e-01,9.4142e-01,1.0356e+00,1.1101e+00] }
-
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas_Bs2DsK')
-    configdict["constParams"].append('deltaGammas_Bs2DsK')
-    configdict["constParams"].append('DeltaMs_Bs2DsK')
-#    configdict["constParams"].append('C_Bs2DsK')
-#    configdict["constParams"].append('Cbar_Bs2DsK')
-#    configdict["constParams"].append('S_Bs2DsK')
-#    configdict["constParams"].append('Sbar_Bs2DsK')
-#    configdict["constParams"].append('D_Bs2DsK')
-#    configdict["constParams"].append('Dbar_Bs2DsK')
-    configdict["constParams"].append('tagEff_OS')
-    configdict["constParams"].append('tagEff_SS')
-    configdict["constParams"].append('aTagEff_OS')
-    configdict["constParams"].append('aTagEff_SS')
-    if configdict["FixAcceptance"] == True:
-        configdict["constParams"].append('var1')
-        configdict["constParams"].append('var2')
-        configdict["constParams"].append('var3')
-        configdict["constParams"].append('var4')
-        configdict["constParams"].append('var5')
-        configdict["constParams"].append('var6')
-    if configdict["ConstrainsForTaggingCalib"] == False:
-        configdict["constParams"].append('p0_OS')
-        configdict["constParams"].append('p0_SS')
-        configdict["constParams"].append('p1_OS')
-        configdict["constParams"].append('p1_SS')
-    configdict["constParams"].append('dp0_OS')
-    configdict["constParams"].append('dp0_SS')
-    configdict["constParams"].append('dp1_OS')
-    configdict["constParams"].append('dp1_SS')
-    configdict["constParams"].append('p0_mean_OS')
-    configdict["constParams"].append('p0_mean_SS')
-    configdict["constParams"].append('p1_mean_OS')
-    configdict["constParams"].append('p1_mean_SS')
-    configdict["constParams"].append('dp0_mean_OS')
-    configdict["constParams"].append('dp0_mean_SS')
-    configdict["constParams"].append('dp1_mean_OS')
-    configdict["constParams"].append('dp1_mean_SS')
-    configdict["constParams"].append('average_OS')
-    configdict["constParams"].append('average_SS')
-
-
-
-
-    #configdict["constParams"].append('DeltaMs')
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFit.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFit.py
deleted file mode 100644
index 40cfdb6b2d4a68cb09b3fc843ade56b9ccb04f15..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFit.py
+++ /dev/null
@@ -1,252 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bs2DsK"
-    configdict["CharmModes"] = {"NonRes","PhiPi","KstK","KPiPi","PiPiPi"} 
-    configdict["Backgrounds"] = ["Bd2DPi","Bd2DK","Lb2LcK","Lb2LcPi","Bs2DsPi","Bs2DsRho","Bs2DsstPi","Bd2DsK","Lb2Dsp","Lb2Dsstp"]
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2011","2012"} 
-    # stripping (necessary in case of PIDK shapes)
-    configdict["Stripping"] = {"2011":"21r1","2012":"21"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes) 
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.56, "Up": 0.42}, "2012":{"Down": 0.9912, "Up": 0.9988}}
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/Bs2DsK/config_Bs2DsK_newBDTG.txt"
-    #settings for control plots 
-    configdict["ControlPlots"] = {} 
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsK_NewBDTG", "Extension":"pdf"} 
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [1.61,    5.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [ 0.10,    1.0     ], "InputName" : "BDTGResponse_3"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-#    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.45    ], "InputName" : "lab0_TAGOMEGA_OS"}
-#    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.45    ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3834, "p1": 0.9720, "average": 0.3813}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4244, "p1": 1.2180, "average": 0.4097}
-
-    HLTcut = "&&(lab0_Hlt1TrackAllL0Decision_TOS && (lab0_Hlt2IncPhiDecision_TOS ==1 || lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1))"
-    # additional cuts applied to data sets
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0&&lab1_PIDmu<2"+HLTcut,            
-                                               "MC" : "lab2_TAU>0&&lab1_M>200&&lab1_PIDK !=-1000.0"+HLTcut, "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9&&lab45_MM<1700", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                     
-    # order of particles: KKPi, KPiPi, PiPiPi                                
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-    #weighting templates by PID eff/misID
-    configdict["WeightingMassTemplates"]= { "PIDBachEff":            { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyKaonEff_5_mu2"},
-                                            "PIDBachMisID":          { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyPionMisID_5_mu2"},
-                                            "PIDBachProtonMisID":    { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyProtonEff_K5_mu2"},
-                                            "PIDChildKaonPionMisID": { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab3_P"], "HistName":"MyPionMisID_0"},
-                                            "PIDChildProtonMisID":   { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"},
-                                                                       "Var":["nTracks","lab4_P"], "HistName":"MyProtonMisID_pKm5_KPi5"},
-                                            "RatioDataMC":{ "FileLabel": {"2011":"#RatioDataMC 2011 PTnTr", "2012": "#RatioDataMC 2012 PTnTr"},
-                                                            "Var":["lab1_PT","nTracks"], "HistName":"histRatio"},
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-    
-    #weighting for PID templates
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[30,30] }
-
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]   = {}
-    configdict["Calibrations"]["2011"]["Proton"]["Up"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]["Down"] = { "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21r1.root"}
-
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsK_Run1_BDTG3.root",
-                                                                  #"FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2011", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsK_Run1_BDTG3.root",
-                                                                    #"FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2011", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]   = {}
-    configdict["Calibrations"]["2012"]["Proton"]["Up"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]["Down"] = { "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID5_Str21r1.root"}
-
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsK_Run1_BDTG3.root",
-                                                                  #"FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2012", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsK_Run1_BDTG3.root",
-                                                                    #"FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2012", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-    
-    # Bs signal shapes                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"NonRes" : 16.3671,   "PhiPi" : 16.291,    "KstK" : 16.1508,   "KPiPi" : 16.2347,   "PiPiPi" : 16.9128},   "Fixed" : True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"NonRes" : 10.8735,   "PhiPi" : 10.9339,   "KstK" : 10.9438,   "KPiPi" : 10.9559,   "PiPiPi" : 11.1463},   "Fixed" : True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"NonRes" : -2.25801,  "PhiPi" : -2.17009,  "KstK" : -2.28933,  "KPiPi" : -2.2631,   "PiPiPi" : -2.26345},  "Fixed" : True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"NonRes" : 2.34818,   "PhiPi" : 2.06867,   "KstK" : 2.17721,   "KPiPi" : 2.14858,   "PiPiPi" : 2.01223},   "Fixed" : True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"NonRes" : 2.82686,   "PhiPi" : 2.96533,   "KstK" : 3.09614,   "KPiPi" : 3.21419,   "PiPiPi" : 3.11023},   "Fixed" : True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"NonRes" : 0.407317,  "PhiPi" : 0.886509,  "KstK" : 0.717488,  "KPiPi" : 0.688164,  "PiPiPi" : 0.887276},  "Fixed" : True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.5,         "PhiPi":0.5,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},         "Fixed":True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"NonRes":1.0663e+00,  "PhiPi":1.1014e+00,  "Kstk":1.0789e+00,  "KPiPi":1.1124e+00,  "PiPiPi":1.0607e+00},  "Fixed":False}
-
-    #Ds signal shapes                                                                                                
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"NonRes" : 5.28549,   "PhiPi" : 5.33497,    "KstK" : 5.73149,   "KPiPi" : 6.54633,   "PiPiPi" : 7.92704},   "Fixed" : True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"NonRes" : 6.10816,   "PhiPi" : 5.7301,     "KstK" : 5.95999,   "KPiPi" : 7.61983,   "PiPiPi" : 8.68266},   "Fixed" : True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"NonRes" : -1.19829,  "PhiPi" : -1.0928,    "KstK" : -1.23869,  "KPiPi" : -1.18576,  "PiPiPi" : -1.03718},  "Fixed" : True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"NonRes" : 1.22329,   "PhiPi" : 1.15676,    "KstK" : 1.2273,    "KPiPi" : 1.10872,   "PiPiPi" : 0.815563},  "Fixed" : True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"NonRes" : 8.17318,   "PhiPi" : 10.1772,    "KstK" : 10.1878,   "KPiPi" : 10.0,      "PiPiPi" : 19.9973},   "Fixed" : True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"NonRes" : 5.23555,   "PhiPi" : 5.72422,    "KstK" : 6.20116,   "KPiPi" : 8.84269,   "PiPiPi" : 48.4227},   "Fixed" : True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},        "Fixed":True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"NonRes":1.0657e+00,  "PhiPi":1.0562e+00,   "KstK":1.0715e+00,  "KPiPi":1.0365e+00,  "PiPiPi":1.0837e+00}, "Fixed":False}
-
-
-    # combinatorial background                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    #configdict["BsCombinatorialShape"]["type"] = "Exponential"
-    #configdict["BsCombinatorialShape"]["cB"]   = {"Run1":{"NonRes":-1.1530e-02,  "PhiPi":-9.2354e-03,  "KstK":-1.3675e-02, "KPiPi":-9.8158e-03, "PiPiPi":-1.0890e-03}, "Fixed":False}
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"NonRes":-8.5211e-03,  "PhiPi":-5.0873e-03,  "KstK":-8.3392e-03, "KPiPi":-5.0361e-03, "PiPiPi":-5.5277e-03},"Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"NonRes":0.0,       "PhiPi":0.0,       "KstK":0.0,      "KPiPi":0.0,         "PiPiPi":0.0},
-                                                   "Fixed":True }
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"NonRes":4.3067e-01,   "PhiPi":6.5400e-01,   "KstK":3.7409e-01,  "KPiPi":1.0,  "PiPiPi":1.0}, "Fixed":{"KPiPi":True, 
-                                                                                                                                                                   "PiPiPi":True}}
-
-
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" #"ExponentialPlusDoubleCrystalBallWithWidthRatioSharedMean"
-    configdict["DsCombinatorialShape"]["cD"]      = {"Run1": {"NonRes":-4.4329e-03,  "PhiPi":-8.8642e-03,  "KstK":-5.2652e-03, "KPiPi":-5.0743e-03, "PiPiPi":-5.1877e-03},"Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"NonRes":0.88620,      "PhiPi":0.37379,     "KstK":0.59093,      "KPiPi":0.5,         "PiPiPi":0.5},"Fixed":False}
-
-    
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "FixedWithKaonPionProton"
-    #configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":True }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK2"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-
-
-    #Bd2Dsh background                                                                                           
-    #shape for BeautyMass, for CharmMass as well as BacPIDK taken by default the same as signal                                                                
-    configdict["Bd2DsKShape"] = {}
-    configdict["Bd2DsKShape"]["BeautyMass"] = {}
-    configdict["Bd2DsKShape"]["BeautyMass"]["type"]    = "ShiftedSignal"
-    configdict["Bd2DsKShape"]["BeautyMass"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2DsKShape"]["BeautyMass"]["scale1"]  = {"Run1": {"All": 0.998944636665}, "Fixed":True}
-    configdict["Bd2DsKShape"]["BeautyMass"]["scale2"]  = {"Run1": {"All": 1.00022181515}, "Fixed":True}
-
-    #                                                                                                                                                                                 
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":1.0, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g2_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g2_f2_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g3_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.75,"Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g5_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.42718, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.50229, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.42718, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.50229, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-
-
-
-    #expected yields                                                                                                                                                              
-    configdict["Yields"] = {}
-    #configdict["Yields"]["Bd2DPi"]            = {"2011": {"NonRes":17.4,    "PhiPi":0.8,    "KstK":12.1,   "KPiPi":0.0,    "PiPiPi":0.0},
-    #                                             "2012": {"NonRes":32.6,    "PhiPi":1.8,    "KstK":26.5,   "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    #configdict["Yields"]["Bd2DK"]             = {"2011": {"NonRes":26.1,    "PhiPi":1.4,    "KstK":19.2,   "KPiPi":0.0,    "PiPiPi":0.0},
-    #                                             "2012": {"NonRes":57.0,    "PhiPi":3.2,    "KstK":46.4,   "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    #configdict["Yields"]["Lb2LcPi"]           = {"2011": {"NonRes":9.0,     "PhiPi":1.3,    "KstK":2.6,    "KPiPi":0.0,    "PiPiPi":0.0},
-    #                                             "2012": {"NonRes":18.1,    "PhiPi":2.9,    "KstK":5.4,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    #configdict["Yields"]["Lb2LcK"]            = {"2011": {"NonRes":13.6,    "PhiPi":2.2,    "KstK":4.1,    "KPiPi":0.0,    "PiPiPi":0.0},
-    #                                             "2012": {"NonRes":31.7,    "PhiPi":5.2,    "KstK":9.5,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    
-    configdict["Yields"]["Bd2DPi"]            = {"2011": {"NonRes":1.7,     "PhiPi":0.1,    "KstK":0.3,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":3.2,     "PhiPi":0.2,    "KstK":0.7,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Bd2DK"]             = {"2011": {"NonRes":3.9,     "PhiPi":0.3,    "KstK":0.8,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":7.6,     "PhiPi":0.6,    "KstK":1.7,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Lb2LcPi"]           = {"2011": {"NonRes":4.9,     "PhiPi":1.1,    "KstK":1.6,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":10.7,    "PhiPi":2.0,    "KstK":3.4,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Lb2LcK"]            = {"2011": {"NonRes":10.9,    "PhiPi":2.4,    "KstK":3.6,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":26.7,    "PhiPi":5.0,    "KstK":8.5,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-
-
-    configdict["Yields"]["Bs2DsDsstKKst"]      = {"2011": {"NonRes":500.0,    "PhiPi":500.0,   "KstK":500.0,   "KPiPi":500.0,   "PiPiPi":500.0},
-                                                  "2012": {"NonRes":1000.0,   "PhiPi":1000.0,  "KstK":1000.0,  "KPiPi":1000.0,  "PiPiPi":1000.0}, "Fixed":False}
-    configdict["Yields"]["BsLb2DsDsstPPiRho"]  = {"2011": {"NonRes":2250.0,   "PhiPi":5000.0,  "KstK":3300.0,  "KPiPi":900.0,   "PiPiPi":2600.0},
-                                                  "2012": {"NonRes":4500.0,   "PhiPi":10000.0, "KstK":6600.0,  "KPiPi":1800.0,  "PiPiPi":2600.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]            = {"2011": {"NonRes":10000.0,  "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                                  "2012": {"NonRes":20000.0,  "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0}, "Fixed":False}
-    configdict["Yields"]["Signal"]             = {"2011": {"NonRes":1000.0,  "PhiPi":1000.0, "KstK":1000.0, "KPiPi":1000.0, "PiPiPi":1000.0},
-                                                  "2012": {"NonRes":2000.0,  "PhiPi":2000.0, "KstK":2000.0, "KPiPi":2000.0, "PiPiPi":2000.0}, "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#            
-    ###                                                               MDfit plotting settings                                                                                 
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------# 
- 
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = { "EPDF": ["Sig", "CombBkg", "Lb2LcK", "Lb2LcPi", "Bd2DK", "Bd2DPi","BsLb2DsDsstPPiRho", "Bs2DsDsstKKst"],
-                                                 "PDF":  ["Sig", "CombBkg", "Lb2LcK", "Lb2LcPi", "Lb2DsDsstP", "Bs2DsDsstPiRho", "Bd2DK", "Bd2DPi","Bs2DsDsstKKst"],
-                                                 "Legend": ["Sig", "CombBkg", "Lb2LcKPi", "Lb2DsDsstP", "Bs2DsDsstPiRho", "Bd2DKPi","Bs2DsDsstKKst"]}
-    configdict["PlotSettings"]["colors"] = { "PDF": [kRed-7, kMagenta-2, kGreen-3, kGreen-3, kYellow-9, kBlue-6, kRed, kRed, kBlue-10],
-                                             "Legend": [kRed-7, kMagenta-2, kGreen-3, kYellow-9, kBlue-6, kRed, kBlue-10]}
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66], 
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitBDTG1.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitBDTG1.py
deleted file mode 100644
index 99a201193d6b7a26e5d3b7ff43760754ff620a70..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitBDTG1.py
+++ /dev/null
@@ -1,234 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bs2DsK"
-    configdict["CharmModes"] = {"NonRes","PhiPi","KstK","KPiPi","PiPiPi"} 
-    configdict["Backgrounds"] = ["Bd2DPi","Bd2DK","Lb2LcK","Lb2LcPi","Bs2DsPi","Bs2DsRho","Bs2DsstPi","Bd2DsK","Lb2Dsp","Lb2Dsstp"]
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2011","2012"} 
-    # stripping (necessary in case of PIDK shapes)
-    configdict["Stripping"] = {"2011":"21r1","2012":"21"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes) 
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.56, "Up": 0.42}, "2012":{"Down": 0.9912, "Up": 0.9988}}
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/Bs2DsK/config_Bs2DsK_newBDTG_filtered.txt"
-    #settings for control plots 
-    configdict["ControlPlots"] = {} 
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsK_BDTG1", "Extension":"pdf"} 
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [1.61,    5.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [ 0.1,    0.95    ], "InputName" : "BDTGResponse_3"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3834, "p1": 0.9720, "average": 0.3813}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4244, "p1": 1.2180, "average": 0.4097}
-
-    HLTcut = "&&(lab0_Hlt1TrackAllL0Decision_TOS && (lab0_Hlt2IncPhiDecision_TOS ==1 || lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1))"
-    # additional cuts applied to data sets
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0&&lab1_PIDmu<2"+HLTcut,            
-                                               "MC" : "lab2_TAU>0&&lab1_M>200&&lab1_PIDK !=-1000.0"+HLTcut, "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9&&lab45_MM<1700", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                     
-    # order of particles: KKPi, KPiPi, PiPiPi                                
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-    #weighting templates by PID eff/misID
-    configdict["WeightingMassTemplates"]= { "PIDBachEff":            { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyKaonEff_5_mu2"},
-                                            "PIDBachMisID":          { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyPionMisID_5_mu2"},
-                                            "PIDBachProtonMisID":     { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyProtonEff_K5_mu2"},
-                                            "PIDChildKaonPionMisID": { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab3_P"], "HistName":"MyPionMisID_0"},
-                                            "PIDChildProtonMisID":   { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"},
-                                                                       "Var":["nTracks","lab4_P"], "HistName":"MyProtonMisID_pKm5_KPi5"},
-                                            "RatioDataMC":{ "FileLabel": {"2011":"#RatioDataMC 2011 PTnTr Filtered", "2012": "#RatioDataMC 2012 PTnTr Filtered"},
-                                                            "Var":["lab1_PT","nTracks"], "HistName":"histRatio"},
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-    
-    #weighting for PID templates
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[30,30] }
-
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]   = {}
-    configdict["Calibrations"]["2011"]["Proton"]["Up"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]["Down"] = { "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21r1.root"}
-
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsK_2011.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsK_2011.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]   = {}
-    configdict["Calibrations"]["2012"]["Proton"]["Up"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]["Down"] = { "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID5_Str21r1.root"}
-
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsK_2012.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsK_2012.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-    
-    # Bs signal shapes                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"NonRes":1.2001e+01,  "PhiPi":1.7779e+01,  "KstK":1.0983e+01,  "KPiPi":1.5354e+01,  "PiPiPi":1.7946e+01},  "Fixed":True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"NonRes":1.3551e+01,  "PhiPi":1.0563e+01,  "KstK":1.6087e+01,  "KPiPi":1.1648e+01,  "PiPiPi":1.0569e+01},  "Fixed":True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"NonRes":-1.8052e+00, "PhiPi":-2.2201e+00, "KstK":-2.0801e+00, "KPiPi":-2.3433e+00, "PiPiPi":-2.5250e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"NonRes":1.1833e+00,  "PhiPi":2.8181e+00,  "KstK":1.4658e+00,  "KPiPi":1.7490e+00,  "PiPiPi":1.7904e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"NonRes":2.8636e+00,  "PhiPi":1.8473e+00,  "KstK":2.2260e+00,  "KPiPi":1.7187e+00,  "PiPiPi":1.9660e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"NonRes":4.7207e+00,  "PhiPi":1.7804e-09,  "KstK":3.9641e+00,  "KPiPi":1.1771e+00,  "PiPiPi":1.2599e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.5,         "PhiPi":0.5,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},         "Fixed":True}
-    #configdict["BsSignalShape"]["R"]       = {"Run1": {"NonRes":1.0663e+00,  "PhiPi":1.1014e+00,  "Kstk":1.0789e+00,  "KPiPi":1.1124e+00,  "PiPiPi":1.0607e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"NonRes":1.0688e+00,  "PhiPi":1.0985e+00,  "Kstk":1.0894e+00,  "KPiPi":1.0889e+00,  "PiPiPi":1.0799e+00},  "Fixed":False}
-
-
-    #Ds signal shapes                                                                                                
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"NonRes":4.7027e+00,  "PhiPi":4.5595e+00,   "KstK":4.7236e+00,  "KPiPi":7.8797e+00,  "PiPiPi":7.6187e+00},  "Fixed":True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"NonRes":7.3516e+00,  "PhiPi":7.5857e+00,   "KstK":7.4875e+00,  "KPiPi":6.4160e+00,  "PiPiPi":8.4359e+00},  "Fixed":True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"NonRes":-1.9272e+00, "PhiPi":-2.1355e+00,  "KstK":-1.9435e+00, "KPiPi":-1.3572e+00, "PiPiPi":-1.0018e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"NonRes":1.8145e+00,  "PhiPi":1.7106e+00,   "KstK":1.7592e+00,  "KPiPi":1.6532e+00,  "PiPiPi":8.6154e-01},  "Fixed":True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"NonRes":2.3283e+00,  "PhiPi":1.6544e+00,   "KstK":2.4362e+00,  "KPiPi":2.8660e+01,  "PiPiPi":4.5603e+01},  "Fixed":True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"NonRes":2.5187e+00,  "PhiPi":3.5765e+00,   "KstK":3.9442e+00,  "KPiPi":1.8414e+00,  "PiPiPi":5.0000e+01},  "Fixed":True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},         "Fixed":True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"NonRes":1.3593e+00,  "PhiPi":1.2772e+00,   "KstK":1.2772e+00,  "KPiPi":1.3424e+00,  "PiPiPi":1.3622e+00}, "Fixed":False}
-
-
-    # combinatorial background                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    #configdict["BsCombinatorialShape"]["type"] = "Exponential"
-    #configdict["BsCombinatorialShape"]["cB"]   = {"Run1":{"NonRes":-4.1530e-03,  "PhiPi":-4.2354e-03,  "KstK":-4.3675e-03, "KPiPi":-4.8158e-03, "PiPiPi":-4.0890e-03}, "Fixed":False}
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"NonRes":-3.5211e-02,  "PhiPi":-3.0873e-02,  "KstK":-2.3392e-02, "KPiPi":-1.0361e-02, "PiPiPi":-1.5277e-02},"Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"NonRes":0.0,       "PhiPi":0.0,       "KstK":0.0,      "KPiPi":0.0,         "PiPiPi":0.0},
-                                                   "Fixed":True }
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"NonRes":4.3067e-01,   "PhiPi":6.5400e-01,   "KstK":3.7409e-01,  "KPiPi":1.0,  "PiPiPi":1.0}, "Fixed":{"KPiPi":True,
-                                                                                                                                                                   "PiPiPi":True}}
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal"
-    configdict["DsCombinatorialShape"]["cD"]      = {"Run1": {"NonRes":-4.4329e-03,  "PhiPi":-8.8642e-03,  "KstK":-5.2652e-03, "KPiPi":-5.0743e-03, "PiPiPi":-5.1877e-03},"Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"NonRes":0.88620,      "PhiPi":0.37379,     "KstK":0.59093,      "KPiPi":0.5,         "PiPiPi":0.5},"Fixed":False}
-
-    
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":True }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK2"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-
-    #Bd2Dsh background                                                                                           
-    #shape for BeautyMass, for CharmMass as well as BacPIDK taken by default the same as signal                                                                
-    configdict["Bd2DsKShape"] = {}
-    configdict["Bd2DsKShape"]["BeautyMass"] = {}
-    configdict["Bd2DsKShape"]["BeautyMass"]["type"]    = "ShiftedSignal"
-    configdict["Bd2DsKShape"]["BeautyMass"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2DsKShape"]["BeautyMass"]["scale1"]  = {"Run1": {"All": 0.998944636665}, "Fixed":True}
-    configdict["Bd2DsKShape"]["BeautyMass"]["scale2"]  = {"Run1": {"All": 1.00022181515}, "Fixed":True}
-    #                                                                                                                                                                                 
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":1.0, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g2_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g2_f2_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g3_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.75,"Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g5_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.42718, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.50229, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.42718, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.50229, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-
-
-
-    #expected yields                                                                                                                                                              
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bd2DPi"]            = {"2011": {"NonRes":0.8,     "PhiPi":0.1,    "KstK":0.1,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":1.6,     "PhiPi":0.1,    "KstK":0.3,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Bd2DK"]             = {"2011": {"NonRes":1.9,     "PhiPi":0.1,    "KstK":0.4,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":3.7,     "PhiPi":0.3,    "KstK":0.8,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Lb2LcPi"]           = {"2011": {"NonRes":2.5,     "PhiPi":0.5,    "KstK":0.8,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":5.2,     "PhiPi":1.0,    "KstK":1.6,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Lb2LcK"]            = {"2011": {"NonRes":5.7,     "PhiPi":1.3,    "KstK":1.9,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":13.9,    "PhiPi":2.6,    "KstK":4.4,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-
-    configdict["Yields"]["Bs2DsDsstKKst"]      = {"2011": {"NonRes":50.0,    "PhiPi":50.0,   "KstK":50.0,   "KPiPi":50.0,   "PiPiPi":50.0},
-                                                  "2012": {"NonRes":100.0,   "PhiPi":100.0,  "KstK":100.0,  "KPiPi":100.0,  "PiPiPi":100.0}, "Fixed":False}
-    configdict["Yields"]["BsLb2DsDsstPPiRho"]  = {"2011": {"NonRes":225.0,   "PhiPi":500.0,  "KstK":330.0,  "KPiPi":90.0,   "PiPiPi":260.0},
-                                                  "2012": {"NonRes":450.0,   "PhiPi":1000.0, "KstK":660.0,  "KPiPi":180.0,  "PiPiPi":260.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]            = {"2011": {"NonRes":1000.0,  "PhiPi":1000.0, "KstK":1000.0, "KPiPi":1000.0, "PiPiPi":1000.0},
-                                                  "2012": {"NonRes":2000.0,  "PhiPi":2000.0, "KstK":2000.0, "KPiPi":2000.0, "PiPiPi":2000.0}, "Fixed":False}
-    configdict["Yields"]["Signal"]             = {"2011": {"NonRes":1000.0,  "PhiPi":1000.0, "KstK":1000.0, "KPiPi":1000.0, "PiPiPi":1000.0},
-                                                  "2012": {"NonRes":2000.0,  "PhiPi":2000.0, "KstK":2000.0, "KPiPi":2000.0, "PiPiPi":2000.0}, "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#            
-    ###                                                               MDfit plotting settings                                                                                 
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------# 
- 
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = { "EPDF": ["Sig", "CombBkg", "Lb2LcK", "Lb2LcPi", "Bd2DK", "Bd2DPi","BsLb2DsDsstPPiRho", "Bs2DsDsstKKst"],
-                                                 "PDF":  ["Sig", "CombBkg", "Lb2LcK", "Lb2LcPi", "Lb2DsDsstP", "Bs2DsDsstPiRho", "Bd2DK", "Bd2DPi","Bs2DsDsstKKst"],
-                                                 "Legend": ["Sig", "CombBkg", "Lb2LcKPi", "Lb2DsDsstP", "Bs2DsDsstPiRho", "Bd2DKPi","Bs2DsDsstKKst"]}
-    configdict["PlotSettings"]["colors"] = { "PDF": [kRed-7, kMagenta-2, kGreen-3, kGreen-3, kYellow-9, kBlue-6, kRed, kRed, kBlue-10],
-                                             "Legend": [kRed-7, kMagenta-2, kGreen-3, kYellow-9, kBlue-6, kRed, kBlue-10]}
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66], 
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitBDTG2.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitBDTG2.py
deleted file mode 100644
index e2c925b0fb18f25657131dc664d507f91fe5dd88..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitBDTG2.py
+++ /dev/null
@@ -1,227 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bs2DsK"
-    configdict["CharmModes"] = {"NonRes","PhiPi","KstK","KPiPi","PiPiPi"} 
-    configdict["Backgrounds"] = ["Bd2DPi","Bd2DK","Lb2LcK","Lb2LcPi","Bs2DsPi","Bs2DsRho","Bs2DsstPi","Bd2DsK","Lb2Dsp","Lb2Dsstp"]
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2011","2012"} 
-    # stripping (necessary in case of PIDK shapes)
-    configdict["Stripping"] = {"2011":"21r1","2012":"21"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes) 
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.56, "Up": 0.42}, "2012":{"Down": 0.9912, "Up": 0.9988}}
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/Bs2DsK/config_Bs2DsK_newBDTG_filtered.txt"
-    #settings for control plots 
-    configdict["ControlPlots"] = {} 
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsK_BDTG2", "Extension":"pdf"} 
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [1.61,    5.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.95,     1.0    ], "InputName" : "BDTGResponse_3"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3834, "p1": 0.9720, "average": 0.3813}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4244, "p1": 1.2180, "average": 0.4097}
-
-    HLTcut = "&&(lab0_Hlt1TrackAllL0Decision_TOS && (lab0_Hlt2IncPhiDecision_TOS ==1 || lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1))"
-    # additional cuts applied to data sets
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0&&lab1_PIDmu<2"+HLTcut,            
-                                               "MC" : "lab2_TAU>0&&lab1_M>200&&lab1_PIDK !=-1000.0"+HLTcut, "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9&&lab45_MM<1700", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                     
-    # order of particles: KKPi, KPiPi, PiPiPi                                
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-    #weighting templates by PID eff/misID
-    configdict["WeightingMassTemplates"]= { "PIDBachEff":            { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyKaonEff_5_mu2"},
-                                            "PIDBachMisID":          { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyPionMisID_5_mu2"},
-                                            "PIDBachProtonMisID":    { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyProtonEff_K5_mu2"},
-                                            "PIDChildKaonPionMisID": { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab3_P"], "HistName":"MyPionMisID_0"},
-                                            "PIDChildProtonMisID":   { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"},
-                                                                       "Var":["nTracks","lab4_P"], "HistName":"MyProtonMisID_pKm5_KPi5"},
-                                            "RatioDataMC":{ "FileLabel": {"2011":"#RatioDataMC 2011 PTnTr Filtered", "2012": "#RatioDataMC 2012 PTnTr Filtered"},
-                                                            "Var":["lab1_PT","nTracks"], "HistName":"histRatio"},
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-
-    
-    #weighting for PID templates
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[30,30] }
-
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]   = {}
-    configdict["Calibrations"]["2011"]["Proton"]["Up"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]["Down"] = { "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21r1.root"}
-
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsK_2011.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsK_2011.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]   = {}
-    configdict["Calibrations"]["2012"]["Proton"]["Up"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]["Down"] = { "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID5_Str21r1.root"}
-
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsK_2012.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsK_2012.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-    
-    # Bs signal shapes                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"NonRes":1.4313e+01,  "PhiPi":1.5633e+01,  "KstK":1.5484e+01,  "KPiPi":1.5218e+01,  "PiPiPi":1.5376e+01},  "Fixed":True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"NonRes":1.0839e+01,  "PhiPi":1.0553e+01,  "KstK":1.0676e+01,  "KPiPi":1.0437e+01,  "PiPiPi":1.0839e+01},  "Fixed":True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"NonRes":-2.2920e+00, "PhiPi":-2.4664e+00, "KstK":-2.7181e+00, "KPiPi":-2.8222e+00, "PiPiPi":-2.4520e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"NonRes":2.0027e+00,  "PhiPi":2.5308e+00,  "KstK":2.7168e+00,  "KPiPi":1.9943e+00,  "PiPiPi":1.7649e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"NonRes":3.1045e+00,  "PhiPi":2.1212e+00,  "KstK":1.9526e+00,  "KPiPi":2.1420e+00,  "PiPiPi":3.0444e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"NonRes":1.2104e+00,  "PhiPi":3.0141e-01,  "KstK":1.6815e-01,  "KPiPi":1.1542e+00,  "PiPiPi":1.6896e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.5,         "PhiPi":0.5,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},         "Fixed":True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"NonRes":1.1080e+00,  "PhiPi":1.0804e+00,  "Kstk":1.1044e+00,  "KPiPi":1.1254e+00,  "PiPiPi":1.0804e+00},  "Fixed":False}
-
-    #Ds signal shapes                                                                                                
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"NonRes":5.0759e+00,  "PhiPi":4.2908e+00,   "KstK":4.4886e+00,  "KPiPi":6.7238e+00,  "PiPiPi":9.7531e+00},  "Fixed":True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"NonRes":5.3082e+00,  "PhiPi":6.3796e+00,   "KstK":6.1201e+00,  "KPiPi":6.3040e+00,  "PiPiPi":6.2100e+00},  "Fixed":True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"NonRes":-1.4670e+00, "PhiPi":-1.4720e+00,  "KstK":-1.5317e+00, "KPiPi":-1.7847e+00, "PiPiPi":-2.2306e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"NonRes":1.4847e+00,  "PhiPi":1.9222e+00,   "KstK":2.1267e+00,  "KPiPi":1.6113e+00,  "PiPiPi":1.6210e+00},  "Fixed":True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"NonRes":9.9998e+01,  "PhiPi":4.0000e+01,   "KstK":4.0000e+01,  "KPiPi":5.4214e+01,  "PiPiPi":7.5384e+01},  "Fixed":True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"NonRes":9.9937e+01,  "PhiPi":9.9993e+01,   "KstK":9.9998e+01,  "KPiPi":9.9997e+01,  "PiPiPi":4.0000e+01},  "Fixed":True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},    "Fixed":True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"NonRes":1.0311e+00,  "PhiPi":1.0444e+00,   "KstK":1.0399e+00,  "KPiPi":1.0705e+00,  "PiPiPi":1.0479e+00}, "Fixed":False}
-
-
-    # combinatorial background                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"] = "Exponential"
-    configdict["BsCombinatorialShape"]["cB"]   = {"Run1":{"NonRes":-8.1530e-03,  "PhiPi":-8.2354e-03,  "KstK":-8.3675e-03, "KPiPi":-8.8158e-03, "PiPiPi":-8.0890e-03}, "Fixed":False}
-
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" #"ExponentialPlusDoubleCrystalBallWithWidthRatioSharedMean"                                                   
-    configdict["DsCombinatorialShape"]["cD"]      = {"Run1": {"NonRes":-4.4329e-03,  "PhiPi":-8.8642e-03,  "KstK":-5.2652e-03, "KPiPi":-5.0743e-03, "PiPiPi":-5.1877e-03},"Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"NonRes":0.88620,      "PhiPi":0.37379,     "KstK":0.59093,      "KPiPi":0.5,         "PiPiPi":0.5},"Fixed":False}
-
-    
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":True }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "Run1":{"All":0.5}, "Fixed":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK2"]   = { "Run1":{"All":0.5}, "Fixed":False }
-
-    #Bd2Dsh background                                                                                           
-    #shape for BeautyMass, for CharmMass as well as BacPIDK taken by default the same as signal                                                                
-    configdict["Bd2DsKShape"] = {}
-    configdict["Bd2DsKShape"]["BeautyMass"] = {}
-    configdict["Bd2DsKShape"]["BeautyMass"]["type"]    = "ShiftedSignal"
-    configdict["Bd2DsKShape"]["BeautyMass"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2DsKShape"]["BeautyMass"]["scale1"]  = {"Run1": {"All": 0.998944636665}, "Fixed":True}
-    configdict["Bd2DsKShape"]["BeautyMass"]["scale2"]  = {"Run1": {"All": 1.00022181515}, "Fixed":True}
-
-    #                                                                                                                                                                                 
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":1.0, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g2_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g2_f2_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g3_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.75,"Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g5_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.42718, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.50229, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.42718, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.50229, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-
-
-
-    #expected yields                                                                                                                                                              
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bd2DPi"]            = {"2011": {"NonRes":0.9,     "PhiPi":0.1,    "KstK":0.1,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":1.6,     "PhiPi":0.1,    "KstK":0.3,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Bd2DK"]             = {"2011": {"NonRes":2.0,     "PhiPi":0.2,    "KstK":0.4,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":3.9,     "PhiPi":0.3,    "KstK":0.9,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Lb2LcPi"]           = {"2011": {"NonRes":2.4,     "PhiPi":0.5,    "KstK":0.8,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":5.2,     "PhiPi":1.0,    "KstK":1.6,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Lb2LcK"]            = {"2011": {"NonRes":5.2,     "PhiPi":1.1,    "KstK":1.7,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":12.8,     "PhiPi":2.4,    "KstK":4.0,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Bs2DsDsstKKst"]      = {"2011": {"NonRes":50.0,    "PhiPi":50.0,   "KstK":50.0,   "KPiPi":50.0,   "PiPiPi":50.0},
-                                                  "2012": {"NonRes":100.0,   "PhiPi":100.0,  "KstK":100.0,  "KPiPi":100.0,  "PiPiPi":100.0}, "Fixed":False}
-    configdict["Yields"]["BsLb2DsDsstPPiRho"]  = {"2011": {"NonRes":225.0,   "PhiPi":500.0,  "KstK":330.0,  "KPiPi":90.0,   "PiPiPi":260.0},
-                                                  "2012": {"NonRes":450.0,   "PhiPi":1000.0, "KstK":660.0,  "KPiPi":180.0,  "PiPiPi":260.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]            = {"2011": {"NonRes":1000.0,  "PhiPi":1000.0, "KstK":1000.0, "KPiPi":1000.0, "PiPiPi":1000.0},
-                                                  "2012": {"NonRes":2000.0,  "PhiPi":2000.0, "KstK":2000.0, "KPiPi":2000.0, "PiPiPi":2000.0}, "Fixed":False}
-    configdict["Yields"]["Signal"]             = {"2011": {"NonRes":1000.0,  "PhiPi":1000.0, "KstK":1000.0, "KPiPi":1000.0, "PiPiPi":1000.0},
-                                                  "2012": {"NonRes":2000.0,  "PhiPi":2000.0, "KstK":2000.0, "KPiPi":2000.0, "PiPiPi":2000.0}, "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#            
-    ###                                                               MDfit plotting settings                                                                                 
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------# 
- 
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = { "EPDF": ["Sig", "CombBkg", "Lb2LcK", "Lb2LcPi", "Bd2DK", "Bd2DPi","BsLb2DsDsstPPiRho", "Bs2DsDsstKKst"],
-                                                 "PDF":  ["Sig", "CombBkg", "Lb2LcK", "Lb2LcPi", "Lb2DsDsstP", "Bs2DsDsstPiRho", "Bd2DK", "Bd2DPi","Bs2DsDsstKKst"],
-                                                 "Legend": ["Sig", "CombBkg", "Lb2LcKPi", "Lb2DsDsstP", "Bs2DsDsstPiRho", "Bd2DKPi","Bs2DsDsstKKst"]}
-    configdict["PlotSettings"]["colors"] = { "PDF": [kRed-7, kMagenta-2, kGreen-3, kGreen-3, kYellow-9, kBlue-6, kRed, kRed, kBlue-10],
-                                             "Legend": [kRed-7, kMagenta-2, kGreen-3, kYellow-9, kBlue-6, kRed, kBlue-10]}
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66], 
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitDown.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitDown.py
deleted file mode 100644
index 2324733944f88fc9cf4c9f3dd995abdb05bcab0a..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitDown.py
+++ /dev/null
@@ -1,249 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bs2DsK"
-    configdict["CharmModes"] = {"NonRes","PhiPi","KstK","KPiPi","PiPiPi"} 
-    configdict["Backgrounds"] = ["Bd2DPi","Bd2DK","Lb2LcK","Lb2LcPi","Bs2DsPi","Bs2DsRho","Bs2DsstPi","Bd2DsK","Lb2Dsp","Lb2Dsstp"]
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2011","2012"} 
-    # stripping (necessary in case of PIDK shapes)
-    configdict["Stripping"] = {"2011":"21r1","2012":"21"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes) 
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.56, "Up": 0.42}, "2012":{"Down": 0.9912, "Up": 0.9988}}
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/Bs2DsK/config_Bs2DsK_newBDTG.txt"
-    #settings for control plots 
-    configdict["ControlPlots"] = {} 
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsK_NewBDTG", "Extension":"pdf"} 
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [1.61,    5.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [ 0.10,    1.0     ], "InputName" : "BDTGResponse_3"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3834, "p1": 0.9720, "average": 0.3813}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4244, "p1": 1.2180, "average": 0.4097}
-
-    HLTcut = "&&(lab0_Hlt1TrackAllL0Decision_TOS && (lab0_Hlt2IncPhiDecision_TOS ==1 || lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1))"
-    # additional cuts applied to data sets
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0&&lab1_PIDmu<2"+HLTcut,            
-                                               "MC" : "lab2_TAU>0&&lab1_M>200&&lab1_PIDK !=-1000.0"+HLTcut, "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9&&lab45_MM<1700", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                     
-    # order of particles: KKPi, KPiPi, PiPiPi                                
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-    #weighting templates by PID eff/misID
-    configdict["WeightingMassTemplates"]= { "PIDBachEff":            { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyKaonEff_5_mu2"},
-                                            "PIDBachMisID":          { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyPionMisID_5_mu2"},
-                                            "PIDBachProtonMisID":    { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyProtonEff_K5_mu2"},
-                                            "PIDChildKaonPionMisID": { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab3_P"], "HistName":"MyPionMisID_0"},
-                                            "PIDChildProtonMisID":   { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"},
-                                                                       "Var":["nTracks","lab4_P"], "HistName":"MyProtonMisID_pKm5_KPi5"},
-                                            "RatioDataMC":{ "FileLabel": {"2011":"#RatioDataMC 2011 PTnTr", "2012": "#RatioDataMC 2012 PTnTr"},
-                                                            "Var":["lab1_PT","nTracks"], "HistName":"histRatio"},
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-    
-    #weighting for PID templates
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[30,30] }
-
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]   = {}
-    configdict["Calibrations"]["2011"]["Proton"]["Up"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]["Down"] = { "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21r1.root"}
-
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsK_Run1_BDTG3.root",
-                                                                  #"FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2011", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsK_Run1_BDTG3.root",
-                                                                    #"FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2011", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]   = {}
-    configdict["Calibrations"]["2012"]["Proton"]["Up"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]["Down"] = { "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID5_Str21r1.root"}
-
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsK_Run1_BDTG3.root",
-                                                                  #"FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2012", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsK_Run1_BDTG3.root",
-                                                                    #"FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2012", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-    
-    # Bs signal shapes                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"NonRes" : 16.3671,   "PhiPi" : 16.291,    "KstK" : 16.1508,   "KPiPi" : 16.2347,   "PiPiPi" : 16.9128},   "Fixed" : True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"NonRes" : 10.8735,   "PhiPi" : 10.9339,   "KstK" : 10.9438,   "KPiPi" : 10.9559,   "PiPiPi" : 11.1463},   "Fixed" : True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"NonRes" : -2.25801,  "PhiPi" : -2.17009,  "KstK" : -2.28933,  "KPiPi" : -2.2631,   "PiPiPi" : -2.26345},  "Fixed" : True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"NonRes" : 2.34818,   "PhiPi" : 2.06867,   "KstK" : 2.17721,   "KPiPi" : 2.14858,   "PiPiPi" : 2.01223},   "Fixed" : True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"NonRes" : 2.82686,   "PhiPi" : 2.96533,   "KstK" : 3.09614,   "KPiPi" : 3.21419,   "PiPiPi" : 3.11023},   "Fixed" : True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"NonRes" : 0.407317,  "PhiPi" : 0.886509,  "KstK" : 0.717488,  "KPiPi" : 0.688164,  "PiPiPi" : 0.887276},  "Fixed" : True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.5,         "PhiPi":0.5,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},         "Fixed":True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"NonRes":1.0663e+00,  "PhiPi":1.1014e+00,  "Kstk":1.0789e+00,  "KPiPi":1.1124e+00,  "PiPiPi":1.0607e+00},  "Fixed":False}
-
-    #Ds signal shapes                                                                                                
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"NonRes" : 5.28549,   "PhiPi" : 5.33497,    "KstK" : 5.73149,   "KPiPi" : 6.54633,   "PiPiPi" : 7.92704},   "Fixed" : True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"NonRes" : 6.10816,   "PhiPi" : 5.7301,     "KstK" : 5.95999,   "KPiPi" : 7.61983,   "PiPiPi" : 8.68266},   "Fixed" : True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"NonRes" : -1.19829,  "PhiPi" : -1.0928,    "KstK" : -1.23869,  "KPiPi" : -1.18576,  "PiPiPi" : -1.03718},  "Fixed" : True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"NonRes" : 1.22329,   "PhiPi" : 1.15676,    "KstK" : 1.2273,    "KPiPi" : 1.10872,   "PiPiPi" : 0.815563},  "Fixed" : True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"NonRes" : 8.17318,   "PhiPi" : 10.1772,    "KstK" : 10.1878,   "KPiPi" : 10.0,      "PiPiPi" : 19.9973},   "Fixed" : True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"NonRes" : 5.23555,   "PhiPi" : 5.72422,    "KstK" : 6.20116,   "KPiPi" : 8.84269,   "PiPiPi" : 48.4227},   "Fixed" : True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},        "Fixed":True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"NonRes":1.0657e+00,  "PhiPi":1.0562e+00,   "KstK":1.0715e+00,  "KPiPi":1.0365e+00,  "PiPiPi":1.0837e+00}, "Fixed":False}
-
-
-    # combinatorial background                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    #configdict["BsCombinatorialShape"]["type"] = "Exponential"
-    #configdict["BsCombinatorialShape"]["cB"]   = {"Run1":{"NonRes":-1.1530e-02,  "PhiPi":-9.2354e-03,  "KstK":-1.3675e-02, "KPiPi":-9.8158e-03, "PiPiPi":-1.0890e-03}, "Fixed":False}
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"NonRes":-3.5211e-02,  "PhiPi":-3.0873e-02,  "KstK":-2.3392e-02, "KPiPi":-1.0361e-02, "PiPiPi":-1.5277e-02},"Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"NonRes":0.0,       "PhiPi":0.0,       "KstK":0.0,      "KPiPi":0.0,         "PiPiPi":0.0},
-                                                   "Fixed":True }
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"NonRes":4.3067e-01,   "PhiPi":6.5400e-01,   "KstK":3.7409e-01,  "KPiPi":1.0,  "PiPiPi":1.0}, "Fixed":{"KPiPi":True, 
-                                                                                                                                                                   "PiPiPi":True}}
-
-
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" #"ExponentialPlusDoubleCrystalBallWithWidthRatioSharedMean"
-    configdict["DsCombinatorialShape"]["cD"]      = {"Run1": {"NonRes":-4.4329e-03,  "PhiPi":-8.8642e-03,  "KstK":-5.2652e-03, "KPiPi":-5.0743e-03, "PiPiPi":-5.1877e-03},"Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"NonRes":0.88620,      "PhiPi":0.37379,     "KstK":0.59093,      "KPiPi":0.5,         "PiPiPi":0.5},"Fixed":False}
-
-    
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":True }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK2"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-
-
-    #Bd2Dsh background                                                                                           
-    #shape for BeautyMass, for CharmMass as well as BacPIDK taken by default the same as signal                                                                
-    configdict["Bd2DsKShape"] = {}
-    configdict["Bd2DsKShape"]["BeautyMass"] = {}
-    configdict["Bd2DsKShape"]["BeautyMass"]["type"]    = "ShiftedSignal"
-    configdict["Bd2DsKShape"]["BeautyMass"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2DsKShape"]["BeautyMass"]["scale1"]  = {"Run1": {"All": 0.998944636665}, "Fixed":True}
-    configdict["Bd2DsKShape"]["BeautyMass"]["scale2"]  = {"Run1": {"All": 1.00022181515}, "Fixed":True}
-    #                                                                                                                                                                                 
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":1.0, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g2_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g2_f2_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g3_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.75,"Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g5_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.42718, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.50229, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.42718, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.50229, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-
-
-
-    #expected yields                                                                                                                                                              
-    configdict["Yields"] = {}
-    #configdict["Yields"]["Bd2DPi"]            = {"2011": {"NonRes":17.4,    "PhiPi":0.8,    "KstK":12.1,   "KPiPi":0.0,    "PiPiPi":0.0},
-    #                                             "2012": {"NonRes":32.6,    "PhiPi":1.8,    "KstK":26.5,   "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    #configdict["Yields"]["Bd2DK"]             = {"2011": {"NonRes":26.1,    "PhiPi":1.4,    "KstK":19.2,   "KPiPi":0.0,    "PiPiPi":0.0},
-    #                                             "2012": {"NonRes":57.0,    "PhiPi":3.2,    "KstK":46.4,   "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    #configdict["Yields"]["Lb2LcPi"]           = {"2011": {"NonRes":9.0,     "PhiPi":1.3,    "KstK":2.6,    "KPiPi":0.0,    "PiPiPi":0.0},
-    #                                             "2012": {"NonRes":18.1,    "PhiPi":2.9,    "KstK":5.4,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    #configdict["Yields"]["Lb2LcK"]            = {"2011": {"NonRes":13.6,    "PhiPi":2.2,    "KstK":4.1,    "KPiPi":0.0,    "PiPiPi":0.0},
-    #                                             "2012": {"NonRes":31.7,    "PhiPi":5.2,    "KstK":9.5,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    
-    configdict["Yields"]["Bd2DPi"]            = {"2011": {"NonRes":1.0,     "PhiPi":0.0,    "KstK":0.2,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":1.6,     "PhiPi":0.1,    "KstK":0.3,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Bd2DK"]             = {"2011": {"NonRes":3.3,     "PhiPi":0.1,    "KstK":0.5,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":3.7,     "PhiPi":0.3,    "KstK":0.8,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Lb2LcPi"]           = {"2011": {"NonRes":2.8,     "PhiPi":0.6,    "KstK":0.9,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":5.3,     "PhiPi":1.0,    "KstK":1.7,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Lb2LcK"]            = {"2011": {"NonRes":6.2,     "PhiPi":1.3,    "KstK":2.0,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":13.2,    "PhiPi":2.5,    "KstK":4.2,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-
-
-    configdict["Yields"]["Bs2DsDsstKKst"]      = {"2011": {"NonRes":500.0,    "PhiPi":500.0,   "KstK":500.0,   "KPiPi":500.0,   "PiPiPi":500.0},
-                                                  "2012": {"NonRes":1000.0,   "PhiPi":1000.0,  "KstK":1000.0,  "KPiPi":1000.0,  "PiPiPi":1000.0}, "Fixed":False}
-    configdict["Yields"]["BsLb2DsDsstPPiRho"]  = {"2011": {"NonRes":2250.0,   "PhiPi":5000.0,  "KstK":3300.0,  "KPiPi":900.0,   "PiPiPi":2600.0},
-                                                  "2012": {"NonRes":4500.0,   "PhiPi":10000.0, "KstK":6600.0,  "KPiPi":1800.0,  "PiPiPi":2600.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]            = {"2011": {"NonRes":10000.0,  "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                                  "2012": {"NonRes":20000.0,  "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0}, "Fixed":False}
-    configdict["Yields"]["Signal"]             = {"2011": {"NonRes":1000.0,  "PhiPi":1000.0, "KstK":1000.0, "KPiPi":1000.0, "PiPiPi":1000.0},
-                                                  "2012": {"NonRes":2000.0,  "PhiPi":2000.0, "KstK":2000.0, "KPiPi":2000.0, "PiPiPi":2000.0}, "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#            
-    ###                                                               MDfit plotting settings                                                                                 
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------# 
- 
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = { "EPDF": ["Sig", "CombBkg", "Lb2LcK", "Lb2LcPi", "Bd2DK", "Bd2DPi","BsLb2DsDsstPPiRho", "Bs2DsDsstKKst"],
-                                                 "PDF":  ["Sig", "CombBkg", "Lb2LcK", "Lb2LcPi", "Lb2DsDsstP", "Bs2DsDsstPiRho", "Bd2DK", "Bd2DPi","Bs2DsDsstKKst"],
-                                                 "Legend": ["Sig", "CombBkg", "Lb2LcKPi", "Lb2DsDsstP", "Bs2DsDsstPiRho", "Bd2DKPi","Bs2DsDsstKKst"]}
-    configdict["PlotSettings"]["colors"] = { "PDF": [kRed-7, kMagenta-2, kGreen-3, kGreen-3, kYellow-9, kBlue-6, kRed, kRed, kBlue-10],
-                                             "Legend": [kRed-7, kMagenta-2, kGreen-3, kYellow-9, kBlue-6, kRed, kBlue-10]}
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66], 
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitFiltered.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitFiltered.py
deleted file mode 100644
index 92202f82150f028f1caca31b958bfbff4cde4479..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitFiltered.py
+++ /dev/null
@@ -1,261 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bs2DsK"
-    configdict["CharmModes"] = {"NonRes","PhiPi","KstK","KPiPi","PiPiPi"} 
-    configdict["Backgrounds"] = ["Bd2DPi","Bd2DK","Lb2LcK","Lb2LcPi","Bs2DsPi","Bs2DsRho","Bs2DsstPi","Bd2DsK","Lb2Dsp","Lb2Dsstp"]
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2012"} #,"2012"} 
-    # stripping (necessary in case of PIDK shapes)
-    configdict["Stripping"] = {"2011":"21r1","2012":"21"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes) 
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.56, "Up": 0.42}, "2012":{"Down": 0.9912, "Up": 0.9988}}
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/Bs2DsK/config_Bs2DsK_newBDTG_filtered.txt"
-    #settings for control plots 
-    configdict["ControlPlots"] = {} 
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsK_NewBDTG", "Extension":"pdf"} 
-
-    configdict["GlobalWeight"] = {"2011": {"NonRes" : {"Down":0.746768, "Up":0.606189},
-                                            "PhiPi"  : {"Down":0.774299, "Up":0.626628},
-                                            "KstK"   : {"Down":0.739354, "Up":0.584960}, 
-                                            "KPiPi"  : {"Down":0.242023, "Up":0.189730},  
-                                            "PiPiPi" : {"Down":0.376287, "Up":0.274021}},
-                                   "2012": {"NonRes" : {"Down":0.921612, "Up":0.979463},
-                                            "PhiPi"  : {"Down":0.878538, "Up":0.936504},
-                                            "KstK"   : {"Down":0.888777, "Up":0.948957},
-                                            "KPiPi"  : {"Down":0.804338, "Up":0.793737},
-                                            "PiPiPi" : {"Down":0.972961, "Up":1.000000}}}
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFitConsD_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [1.61,    5.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFitConsD_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.1,     1.0    ], "InputName" : "BDTGResponse_3"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3834, "p1": 0.9720, "average": 0.3813}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4244, "p1": 1.2180, "average": 0.4097}
-
-    HLTcut = "&&(lab0_Hlt1TrackAllL0Decision_TOS && (lab0_Hlt2IncPhiDecision_TOS ==1 || lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1))"
-    # additional cuts applied to data sets
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0&&lab1_PIDmu<2"+HLTcut,            
-                                               "MC" : "lab2_TAU>0&&lab1_M>200&&lab1_PIDK !=-1000.0"+HLTcut, "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9&&lab45_MM<1700", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                     
-    # order of particles: KKPi, KPiPi, PiPiPi                                
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-    #weighting templates by PID eff/misID
-    configdict["WeightingMassTemplates"]= { "PIDBachEff":            { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyKaonEff_5_mu2"},
-                                            "PIDBachMisID":          { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyPionMisID_5_mu2"},
-                                            "PIDBachProtonMisID":    { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyProtonEff_K5_mu2"},
-                                            "PIDChildKaonPionMisID": { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab3_P"], "HistName":"MyPionMisID_0"},
-                                            "PIDChildProtonMisID":   { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"},
-                                                                       "Var":["nTracks","lab4_P"], "HistName":"MyProtonMisID_pKm5_KPi5"},
-                                            "RatioDataMC":{ "FileLabel": {"2011":"#RatioDataMC 2011 PTnTr Filtered", "2012": "#RatioDataMC 2012 PTnTr Filtered"},
-                                                            "Var":["lab1_PT","nTracks"], "HistName":"histRatio"},
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-    
-    #weighting for PID templates
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[30,30] }
-
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]   = {}
-    configdict["Calibrations"]["2011"]["Proton"]["Up"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]["Down"] = { "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21r1.root"}
-
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsK_Run1_BDTG3.root",
-                                                                  #"FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2011", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsK_Run1_BDTG3.root",
-                                                                    #"FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2011", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]   = {}
-    configdict["Calibrations"]["2012"]["Proton"]["Up"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]["Down"] = { "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID5_Str21r1.root"}
-
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsK_Run1_BDTG3.root",
-                                                                  #"FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2012", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsK_Run1_BDTG3.root",
-                                                                    #"FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2012", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-    
-    # Bs signal shapes                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"NonRes" : 16.3671,   "PhiPi" : 16.291,    "KstK" : 16.1508,   "KPiPi" : 16.2347,   "PiPiPi" : 16.9128},   "Fixed" : True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"NonRes" : 10.8735,   "PhiPi" : 10.9339,   "KstK" : 10.9438,   "KPiPi" : 10.9559,   "PiPiPi" : 11.1463},   "Fixed" : True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"NonRes" : -2.25801,  "PhiPi" : -2.17009,  "KstK" : -2.28933,  "KPiPi" : -2.2631,   "PiPiPi" : -2.26345},  "Fixed" : True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"NonRes" : 2.34818,   "PhiPi" : 2.06867,   "KstK" : 2.17721,   "KPiPi" : 2.14858,   "PiPiPi" : 2.01223},   "Fixed" : True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"NonRes" : 2.82686,   "PhiPi" : 2.96533,   "KstK" : 3.09614,   "KPiPi" : 3.21419,   "PiPiPi" : 3.11023},   "Fixed" : True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"NonRes" : 0.407317,  "PhiPi" : 0.886509,  "KstK" : 0.717488,  "KPiPi" : 0.688164,  "PiPiPi" : 0.887276},  "Fixed" : True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.5,         "PhiPi":0.5,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},         "Fixed":True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"NonRes":1.0815e+00,  "PhiPi":1.0826e+00,  "Kstk":1.0821e+00,  "KPiPi":1.0774e+00,  "PiPiPi":1.0696e+00},  "Fixed":True}
-
-    #Ds signal shapes                                                                                                
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"NonRes" : 5.28549,   "PhiPi" : 5.33497,    "KstK" : 5.73149,   "KPiPi" : 6.54633,   "PiPiPi" : 7.92704},   "Fixed" : True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"NonRes" : 6.10816,   "PhiPi" : 5.7301,     "KstK" : 5.95999,   "KPiPi" : 7.61983,   "PiPiPi" : 8.68266},   "Fixed" : True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"NonRes" : -1.19829,  "PhiPi" : -1.0928,    "KstK" : -1.23869,  "KPiPi" : -1.18576,  "PiPiPi" : -1.03718},  "Fixed" : True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"NonRes" : 1.22329,   "PhiPi" : 1.15676,    "KstK" : 1.2273,    "KPiPi" : 1.10872,   "PiPiPi" : 0.815563},  "Fixed" : True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"NonRes" : 8.17318,   "PhiPi" : 10.1772,    "KstK" : 10.1878,   "KPiPi" : 10.0,      "PiPiPi" : 19.9973},   "Fixed" : True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"NonRes" : 5.23555,   "PhiPi" : 5.72422,    "KstK" : 6.20116,   "KPiPi" : 8.84269,   "PiPiPi" : 48.4227},   "Fixed" : True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},        "Fixed":True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"NonRes":1.0399e+00,  "PhiPi":1.0559e+00,   "KstK":1.0532e+00,  "KPiPi":1.0468e+00,  "PiPiPi":1.0493e+00}, "Fixed":True}
-
-
-    # combinatorial background                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    #configdict["BsCombinatorialShape"]["type"] = "Exponential"
-    #configdict["BsCombinatorialShape"]["cB"]   = {"Run1":{"NonRes":-1.1530e-02,  "PhiPi":-9.2354e-03,  "KstK":-1.3675e-02, "KPiPi":-9.8158e-03, "PiPiPi":-1.0890e-03}, "Fixed":False}
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"NonRes":-7.5211e-03,  "PhiPi":-6.0873e-03,  "KstK":-7.3392e-03, "KPiPi":-6.0361e-03, "PiPiPi":-6.5277e-03},"Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"NonRes":0.0,       "PhiPi":0.0,       "KstK":0.0,      "KPiPi":0.0,         "PiPiPi":0.0},
-                                                   "Fixed":True }
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"NonRes":4.3067e-01,   "PhiPi":6.5400e-01,   "KstK":3.7409e-01,  "KPiPi":1.0,  "PiPiPi":1.0}, "Fixed":{"KPiPi":True, 
-                                                                                                                                                                   "PiPiPi":True}}
-
-
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" #"ExponentialPlusDoubleCrystalBallWithWidthRatioSharedMean"
-    configdict["DsCombinatorialShape"]["cD"]      = {"Run1": {"NonRes":-5.4329e-03,  "PhiPi":-7.8642e-03,  "KstK":-7.2652e-03, "KPiPi":-6.0743e-03, "PiPiPi":-4.1877e-03},"Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"NonRes":0.88620,      "PhiPi":0.37379,     "KstK":0.59093,      "KPiPi":0.5,         "PiPiPi":0.5},"Fixed":False}
-
-    
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":True }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK2"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-
-
-    #Bd2Dsh background                                                                                           
-    #shape for BeautyMass, for CharmMass as well as BacPIDK taken by default the same as signal                                                                
-    configdict["Bd2DsKShape"] = {}
-    configdict["Bd2DsKShape"]["BeautyMass"] = {}
-    configdict["Bd2DsKShape"]["BeautyMass"]["type"]    = "ShiftedSignal"
-    configdict["Bd2DsKShape"]["BeautyMass"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2DsKShape"]["BeautyMass"]["scale1"]  = {"Run1": {"All": 0.998944636665}, "Fixed":True}
-    configdict["Bd2DsKShape"]["BeautyMass"]["scale2"]  = {"Run1": {"All": 1.00022181515}, "Fixed":True}
-
-    #                                                                                                                                                                                 
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":1.0, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g2_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g2_f2_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g3_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.75,"Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g5_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.42718, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.50229, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.42718, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.50229, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-
-
-
-    #expected yields                                                                                                                                                              
-    configdict["Yields"] = {}
-    #configdict["Yields"]["Bd2DPi"]            = {"2011": {"NonRes":17.4,    "PhiPi":0.8,    "KstK":12.1,   "KPiPi":0.0,    "PiPiPi":0.0},
-    #                                             "2012": {"NonRes":32.6,    "PhiPi":1.8,    "KstK":26.5,   "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    #configdict["Yields"]["Bd2DK"]             = {"2011": {"NonRes":26.1,    "PhiPi":1.4,    "KstK":19.2,   "KPiPi":0.0,    "PiPiPi":0.0},
-    #                                             "2012": {"NonRes":57.0,    "PhiPi":3.2,    "KstK":46.4,   "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    #configdict["Yields"]["Lb2LcPi"]           = {"2011": {"NonRes":9.0,     "PhiPi":1.3,    "KstK":2.6,    "KPiPi":0.0,    "PiPiPi":0.0},
-    #                                             "2012": {"NonRes":18.1,    "PhiPi":2.9,    "KstK":5.4,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    #configdict["Yields"]["Lb2LcK"]            = {"2011": {"NonRes":13.6,    "PhiPi":2.2,    "KstK":4.1,    "KPiPi":0.0,    "PiPiPi":0.0},
-    #                                             "2012": {"NonRes":31.7,    "PhiPi":5.2,    "KstK":9.5,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    
-    configdict["Yields"]["Bd2DPi"]            = {"2011": {"NonRes":1.7,     "PhiPi":0.1,    "KstK":0.3,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":3.2,     "PhiPi":0.2,    "KstK":0.7,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Bd2DK"]             = {"2011": {"NonRes":3.9,     "PhiPi":0.3,    "KstK":0.8,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":7.6,     "PhiPi":0.6,    "KstK":1.7,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Lb2LcPi"]           = {"2011": {"NonRes":4.9,     "PhiPi":1.1,    "KstK":1.6,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":10.7,    "PhiPi":2.0,    "KstK":3.4,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Lb2LcK"]            = {"2011": {"NonRes":10.9,    "PhiPi":2.4,    "KstK":3.6,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":26.7,    "PhiPi":5.0,    "KstK":8.5,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-
-
-    configdict["Yields"]["Bs2DsDsstKKst"]      = {"2011": {"NonRes":500.0,    "PhiPi":500.0,   "KstK":500.0,   "KPiPi":500.0,   "PiPiPi":500.0},
-                                                  "2012": {"NonRes":1000.0,   "PhiPi":1000.0,  "KstK":1000.0,  "KPiPi":1000.0,  "PiPiPi":1000.0}, "Fixed":False}
-    configdict["Yields"]["BsLb2DsDsstPPiRho"]  = {"2011": {"NonRes":2250.0,   "PhiPi":5000.0,  "KstK":3300.0,  "KPiPi":900.0,   "PiPiPi":2600.0},
-                                                  "2012": {"NonRes":4500.0,   "PhiPi":10000.0, "KstK":6600.0,  "KPiPi":1800.0,  "PiPiPi":2600.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]            = {"2011": {"NonRes":10000.0,  "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                                  "2012": {"NonRes":20000.0,  "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0}, "Fixed":False}
-    configdict["Yields"]["Signal"]             = {"2011": {"NonRes":1000.0,  "PhiPi":1000.0, "KstK":1000.0, "KPiPi":1000.0, "PiPiPi":1000.0},
-                                                  "2012": {"NonRes":2000.0,  "PhiPi":2000.0, "KstK":2000.0, "KPiPi":2000.0, "PiPiPi":2000.0}, "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#            
-    ###                                                               MDfit plotting settings                                                                                 
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------# 
- 
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = { "EPDF": ["Sig", "CombBkg", "Lb2LcK", "Lb2LcPi", "Bd2DK", "Bd2DPi","BsLb2DsDsstPPiRho", "Bs2DsDsstKKst"],
-                                                 "PDF":  ["Sig", "CombBkg", "Lb2LcK", "Lb2LcPi", "Lb2DsDsstP", "Bs2DsDsstPiRho", "Bd2DK", "Bd2DPi","Bs2DsDsstKKst"],
-                                                 "Legend": ["Sig", "CombBkg", "Lb2LcKPi", "Lb2DsDsstP", "Bs2DsDsstPiRho", "Bd2DKPi","Bs2DsDsstKKst"]}
-    configdict["PlotSettings"]["colors"] = { "PDF": [kRed-7, kMagenta-2, kGreen-3, kGreen-3, kYellow-9, kBlue-6, kRed, kRed, kBlue-10],
-                                             "Legend": [kRed-7, kMagenta-2, kGreen-3, kYellow-9, kBlue-6, kRed, kBlue-10]}
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66], 
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitP1.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitP1.py
deleted file mode 100644
index f9d02584da220184580c7dc2de3e44aa0aaa53b5..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitP1.py
+++ /dev/null
@@ -1,241 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bs2DsK"
-    configdict["CharmModes"] = {"NonRes","PhiPi","KstK","KPiPi","PiPiPi"} 
-    configdict["Backgrounds"] = ["Bd2DPi","Bd2DK","Lb2LcK","Lb2LcPi","Bs2DsPi","Bs2DsRho","Bs2DsstPi","Bd2DsK","Lb2Dsp","Lb2Dsstp"]
-
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2011","2012"} 
-    # stripping (necessary in case of PIDK shapes)
-    configdict["Stripping"] = {"2011":"21r1","2012":"21"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes) 
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.56, "Up": 0.42}, "2012":{"Down": 0.9912, "Up": 0.9988}}
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/Bs2DsK/config_Bs2DsK_newBDTG_filtered.txt"
-    #settings for control plots 
-    configdict["ControlPlots"] = {} 
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsK_BsP1", "Extension":"pdf"} 
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [1.61,    5.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [ 0.1,    1.0     ], "InputName" : "BDTGResponse_3"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3834, "p1": 0.9720, "average": 0.3813}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4244, "p1": 1.2180, "average": 0.4097}
-
-    HLTcut = "&&(lab0_Hlt1TrackAllL0Decision_TOS && (lab0_Hlt2IncPhiDecision_TOS ==1 || lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1))"
-    # additional cuts applied to data sets
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab0_P<120000&&lab2_TAU>0&&lab1_PIDmu<2"+HLTcut,            
-                                               "MC" : "lab0_P<120000&&lab2_TAU>0&&lab1_M>200&&lab1_PIDK !=-1000.0"+HLTcut, "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9&&lab45_MM<1700", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                     
-    # order of particles: KKPi, KPiPi, PiPiPi                                
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-    #weighting templates by PID eff/misID
-    configdict["WeightingMassTemplates"]= { "PIDBachEff":            { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyKaonEff_5_mu2"},
-                                            "PIDBachMisID":          { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyPionMisID_5_mu2"},
-                                            "PIDBachProtonMisID":    { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyProtonEff_K5_mu2"},
-                                            "PIDChildKaonPionMisID": { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab3_P"], "HistName":"MyPionMisID_0"},
-                                            "PIDChildProtonMisID":   { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"},
-                                                                       "Var":["nTracks","lab4_P"], "HistName":"MyProtonMisID_pKm5_KPi5"},
-                                            "RatioDataMC": {"FileLabel": {"2011":"#RatioDataMC 2011 PTnTr Filtered", "2012": "#RatioDataMC 2012 PTnTr Filtered"},
-                                                            "Var":["lab1_PT","nTracks"], "HistName":"histRatio"},
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-
-    
-    #weighting for PID templates
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[30,30] }
-
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]   = {}
-    configdict["Calibrations"]["2011"]["Proton"]["Up"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]["Down"] = { "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21r1.root"}
-
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { #"FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsK_2011.root",
-                                                                  "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3_BsP1.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2011", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { #"FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsK_2011.root",
-                                                                    "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3_BsP1.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2011", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-    
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]   = {}
-    configdict["Calibrations"]["2012"]["Proton"]["Up"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]["Down"] = { "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID5_Str21r1.root"}
-
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { #"FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsK_2012.root",
-                                                                  "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3_BsP1.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2012", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { #"FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsK_2012.root",
-                                                                    "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3_BsP1.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2012", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-
-    
-    # Bs signal shapes                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"NonRes":1.4951e+01,  "PhiPi":1.5170e+01,  "KstK":1.4965e+01,  "KPiPi":1.5357e+01,  "PiPiPi":1.5698e+01},  "Fixed":True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"NonRes":1.0571e+01,  "PhiPi":1.0421e+01,  "KstK":1.0192e+01,  "KPiPi":1.0379e+01,  "PiPiPi":1.0353e+01},  "Fixed":True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"NonRes":-2.1949e+00, "PhiPi":-2.2191e+00, "KstK":-2.4113e+00, "KPiPi":-2.3033e+00, "PiPiPi":-2.4350e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"NonRes":1.9928e+00,  "PhiPi":2.2044e+00,  "KstK":1.8828e+00,  "KPiPi":2.1347e+00,  "PiPiPi":2.0052e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"NonRes":2.8475e+00,  "PhiPi":2.8782e+00,  "KstK":2.5325e+00,  "KPiPi":3.0966e+00,  "PiPiPi":2.8920e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"NonRes":1.0686e+00,  "PhiPi":7.3809e-01,  "KstK":1.2195e+00,  "KPiPi":6.8990e-01,  "PiPiPi":9.2581e-01},  "Fixed":True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.5,         "PhiPi":0.5,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},         "Fixed":True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"NonRes":1.0225e+00,  "PhiPi":1.0166e+00,  "Kstk":1.0112e+00,  "KPiPi":1.0383e+00,  "PiPiPi":1.0033e+00},  "Fixed":False}
-
-    #Ds signal shapes                                                                                                
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"NonRes":4.2549e+00,  "PhiPi":5.1372e+00,   "KstK":4.7236e+00,  "KPiPi":6.5756e+00,  "PiPiPi":9.5309e+00},  "Fixed":True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"NonRes":7.4230e+00,  "PhiPi":5.1670e+00,   "KstK":7.4875e+00,  "KPiPi":6.8750e+00,  "PiPiPi":6.7475e+00},  "Fixed":True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"NonRes":-2.2029e+00, "PhiPi":-1.2110e+00,  "KstK":-2.5316e+00, "KPiPi":-1.3980e+00, "PiPiPi":-1.5088e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"NonRes":1.9603e+00,  "PhiPi":1.3148e+00,   "KstK":1.8138e+00,  "KPiPi":1.2792e+00,  "PiPiPi":1.6718e+00},  "Fixed":True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"NonRes":1.3526e+00,  "PhiPi":9.2680e+00,   "KstK":9.0913e-01,  "KPiPi":6.6983e+00,  "PiPiPi":5.0000e+01},  "Fixed":True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"NonRes":1.3801e+00,  "PhiPi":3.7056e+00,   "KstK":2.7012e+00,  "KPiPi":3.3650e+00,  "PiPiPi":9.6257e-01},  "Fixed":True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},         "Fixed":True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"NonRes":1.05000000,  "PhiPi":1.0562e+00,   "KstK":1.0715e+00,  "KPiPi":1.0365e+00,  "PiPiPi":1.0837e+00}, "Fixed":False}
-
-
-    # combinatorial background                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    #configdict["BsCombinatorialShape"]["type"] = "Exponential"
-    #configdict["BsCombinatorialShape"]["cB"]   = {"Run1":{"NonRes":-1.1530e-02,  "PhiPi":-9.2354e-03,  "KstK":-1.3675e-02, "KPiPi":-9.8158e-03, "PiPiPi":-1.0890e-03}, "Fixed":False}
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"NonRes":-8.5211e-03,  "PhiPi":-5.0873e-03,  "KstK":-8.3392e-03, "KPiPi":-5.0361e-03, "PiPiPi":-5.5277e-03},"Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"NonRes":0.0,       "PhiPi":0.0,       "KstK":0.0,      "KPiPi":0.0,         "PiPiPi":0.0},
-                                                   "Fixed":True }
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"NonRes":4.3067e-01,   "PhiPi":6.5400e-01,   "KstK":3.7409e-01,  "KPiPi":1.0,  "PiPiPi":1.0}, "Fixed":{"KPiPi":True,
-                                                                                                                                                                   "PiPiPi":True}}
-
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal"
-    configdict["DsCombinatorialShape"]["cD"]      = {"Run1": {"NonRes":-4.4329e-03,  "PhiPi":-8.8642e-03,  "KstK":-5.2652e-03, "KPiPi":-5.0743e-03, "PiPiPi":-5.1877e-03},"Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"NonRes":0.88620,      "PhiPi":0.37379,     "KstK":0.59093,      "KPiPi":0.5,         "PiPiPi":0.5},"Fixed":False}
-
-
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":True }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK2"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-
-
-    #Bd2Dsh background                                                                                           
-    #shape for BeautyMass, for CharmMass as well as BacPIDK taken by default the same as signal                                                                
-    configdict["Bd2DsKShape"] = {}
-    configdict["Bd2DsKShape"]["BeautyMass"] = {}
-    configdict["Bd2DsKShape"]["BeautyMass"]["type"]    = "ShiftedSignal"
-    configdict["Bd2DsKShape"]["BeautyMass"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2DsKShape"]["BeautyMass"]["scale1"]  = {"Run1": {"All": 0.998944636665}, "Fixed":True}
-    configdict["Bd2DsKShape"]["BeautyMass"]["scale2"]  = {"Run1": {"All": 1.00022181515}, "Fixed":True}
-
-    #                                                                                                                                                                                 
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":1.0, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g2_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g2_f2_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g3_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.75,"Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g5_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.42718, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.50229, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.42718, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.50229, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-
-
-
-    #expected yields                                                                                                                                                              
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bd2DPi"]            = {"2011": {"NonRes":0.9,     "PhiPi":0.0,    "KstK":0.15,   "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":1.6,     "PhiPi":0.1,    "KstK":0.35,   "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Bd2DK"]             = {"2011": {"NonRes":2.0,     "PhiPi":0.2,    "KstK":0.4,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":3.8,     "PhiPi":0.5,    "KstK":0.9,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Lb2LcPi"]           = {"2011": {"NonRes":2.5,     "PhiPi":1.0,    "KstK":0.8,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":5.3,     "PhiPi":2.9,    "KstK":1.7,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Lb2LcK"]            = {"2011": {"NonRes":5.5,     "PhiPi":1.2,    "KstK":1.8,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":13.4,    "PhiPi":2.5,    "KstK":4.3,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-
-    configdict["Yields"]["Bs2DsDsstKKst"]      = {"2011": {"NonRes":50.0,    "PhiPi":50.0,   "KstK":50.0,   "KPiPi":50.0,   "PiPiPi":50.0},
-                                                  "2012": {"NonRes":100.0,   "PhiPi":100.0,  "KstK":100.0,  "KPiPi":100.0,  "PiPiPi":100.0}, "Fixed":False}
-    configdict["Yields"]["BsLb2DsDsstPPiRho"]  = {"2011": {"NonRes":225.0,   "PhiPi":500.0,  "KstK":330.0,  "KPiPi":90.0,   "PiPiPi":260.0},
-                                                  "2012": {"NonRes":450.0,   "PhiPi":1000.0, "KstK":660.0,  "KPiPi":180.0,  "PiPiPi":260.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]            = {"2011": {"NonRes":1000.0,  "PhiPi":1000.0, "KstK":1000.0, "KPiPi":1000.0, "PiPiPi":1000.0},
-                                                  "2012": {"NonRes":2000.0,  "PhiPi":2000.0, "KstK":2000.0, "KPiPi":2000.0, "PiPiPi":2000.0}, "Fixed":False}
-    configdict["Yields"]["Signal"]             = {"2011": {"NonRes":1000.0,  "PhiPi":1000.0, "KstK":1000.0, "KPiPi":1000.0, "PiPiPi":1000.0},
-                                                  "2012": {"NonRes":2000.0,  "PhiPi":2000.0, "KstK":2000.0, "KPiPi":2000.0, "PiPiPi":2000.0}, "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#            
-    ###                                                               MDfit plotting settings                                                                                 
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------# 
- 
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = { "EPDF": ["Sig", "CombBkg", "Lb2LcK", "Lb2LcPi", "Bd2DK", "Bd2DPi","BsLb2DsDsstPPiRho", "Bs2DsDsstKKst"],
-                                                 "PDF":  ["Sig", "CombBkg", "Lb2LcK", "Lb2LcPi", "Lb2DsDsstP", "Bs2DsDsstPiRho", "Bd2DK", "Bd2DPi","Bs2DsDsstKKst"],
-                                                 "Legend": ["Sig", "CombBkg", "Lb2LcKPi", "Lb2DsDsstP", "Bs2DsDsstPiRho", "Bd2DKPi","Bs2DsDsstKKst"]}
-    configdict["PlotSettings"]["colors"] = { "PDF": [kRed-7, kMagenta-2, kGreen-3, kGreen-3, kYellow-9, kBlue-6, kRed, kRed, kBlue-10],
-                                             "Legend": [kRed-7, kMagenta-2, kGreen-3, kYellow-9, kBlue-6, kRed, kBlue-10]}
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66], 
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitP2.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitP2.py
deleted file mode 100644
index 26586719c8d149d12069ca452031f963205b50e8..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitP2.py
+++ /dev/null
@@ -1,237 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bs2DsK"
-    configdict["CharmModes"] = {"NonRes","PhiPi","KstK","KPiPi","PiPiPi"} 
-    configdict["Backgrounds"] = ["Bd2DPi","Bd2DK","Lb2LcK","Lb2LcPi","Bs2DsPi","Bs2DsRho","Bs2DsstPi","Bd2DsK","Lb2Dsp","Lb2Dsstp"]
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2011","2012"} 
-    # stripping (necessary in case of PIDK shapes)
-    configdict["Stripping"] = {"2011":"21r1","2012":"21"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes) 
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.56, "Up": 0.42}, "2012":{"Down": 0.9912, "Up": 0.9988}}
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/Bs2DsK/config_Bs2DsK_newBDTG_filtered.txt"
-    #settings for control plots 
-    configdict["ControlPlots"] = {} 
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsK_BsP2", "Extension":"pdf"} 
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [1.61,    5.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [ 0.1,     1.0    ], "InputName" : "BDTGResponse_3"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3834, "p1": 0.9720, "average": 0.3813}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4244, "p1": 1.2180, "average": 0.4097}
-
-    HLTcut = "&&(lab0_Hlt1TrackAllL0Decision_TOS && (lab0_Hlt2IncPhiDecision_TOS ==1 || lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1))"
-    # additional cuts applied to data sets
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab0_P>=120000&&lab2_TAU>0&&lab1_PIDmu<2"+HLTcut,            
-                                               "MC" : "lab0_P>=120000&&lab2_TAU>0&&lab1_M>200&&lab1_PIDK !=-1000.0"+HLTcut, "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9&&lab45_MM<1700", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                     
-    # order of particles: KKPi, KPiPi, PiPiPi                                
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-    #weighting templates by PID eff/misID
-    configdict["WeightingMassTemplates"]= { "PIDBachEff":            { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyKaonEff_5_mu2"},
-                                            "PIDBachMisID":          { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyPionMisID_5_mu2"},
-                                            "PIDBachProtonMisID":    { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyProtonEff_K5_mu2"},
-                                            "PIDChildKaonPionMisID": { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab3_P"], "HistName":"MyPionMisID_0"},
-                                            "PIDChildProtonMisID":   { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"},
-                                                                       "Var":["nTracks","lab4_P"], "HistName":"MyProtonMisID_pKm5_KPi5"},
-                                            "RatioDataMC":{ "FileLabel": {"2011":"#RatioDataMC 2011 PTnTr Filtered", "2012": "#RatioDataMC 2012 PTnTr Filtered"},
-                                                            "Var":["lab1_PT","nTracks"], "HistName":"histRatio"},
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-
-    
-    #weighting for PID templates
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[30,30] }
-
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]   = {}
-    configdict["Calibrations"]["2011"]["Proton"]["Up"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]["Down"] = { "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21r1.root"}
-
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { #"FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsK_2011.root",
-                                                                  "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3_BsP2.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2011", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { #"FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsK_2011.root",
-                                                                    "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3_BsP2.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2011", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-    
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]   = {}
-    configdict["Calibrations"]["2012"]["Proton"]["Up"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]["Down"] = { "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID5_Str21r1.root"}
-
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { #"FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsK_2012.root",
-                                                                  "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3_BsP2.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2012", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { #"FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsK_2012.root",
-                                                                    "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3_BsP2.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2012", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-
-    
-    # Bs signal shapes                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"NonRes":1.4463e+01,  "PhiPi":1.6527e+01,  "KstK":5.6086e+00,  "KPiPi":1.5252e+01,  "PiPiPi":1.6541e+01},  "Fixed":True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"NonRes":1.0932e+01,  "PhiPi":1.0469e+01,  "KstK":1.0656e+01,  "KPiPi":1.0961e+01,  "PiPiPi":1.0652e+01},  "Fixed":True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"NonRes":-2.1830e+00, "PhiPi":-2.3682e+00, "KstK":-2.9191e+00, "KPiPi":-2.6083e+00, "PiPiPi":-2.3757e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"NonRes":1.7323e+00,  "PhiPi":2.6768e+00,  "KstK":2.0521e+00,  "KPiPi":1.8731e+00,  "PiPiPi":1.8091e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"NonRes":2.7064e+00,  "PhiPi":1.8813e+00,  "KstK":4.0345e-01,  "KPiPi":1.6047e+00,  "PiPiPi":3.2171e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"NonRes":1.5260e+00,  "PhiPi":1.1171e-01,  "KstK":2.2293e+00,  "KPiPi":1.2051e+00,  "PiPiPi":1.3755e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.5,         "PhiPi":0.5,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},         "Fixed":True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"NonRes":1.0663e+00,  "PhiPi":1.1014e+00,  "Kstk":1.0789e+00,  "KPiPi":1.1124e+00,  "PiPiPi":1.0607e+00},  "Fixed":False}
-
-
-    #Ds signal shapes                                                                                                
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"NonRes":5.9408e+00,  "PhiPi":6.5869e+00,   "KstK":5.6086e+00,  "KPiPi":8.2305e+00,  "PiPiPi":9.8878e+00},  "Fixed":True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"NonRes":7.5355e+00,  "PhiPi":6.5137e+00,   "KstK":9.4898e+00,  "KPiPi":8.3018e+00,  "PiPiPi":1.0570e+01},  "Fixed":True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"NonRes":-1.4519e+00, "PhiPi":-1.1117e+00,  "KstK":-2.9191e+00, "KPiPi":-1.1102e+00, "PiPiPi":-1.0512e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"NonRes":1.1978e+00,  "PhiPi":1.1560e+00,   "KstK":2.0521e+00,  "KPiPi":1.1769e+00,  "PiPiPi":8.9169e-01},  "Fixed":True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"NonRes":4.5286e+00,  "PhiPi":1.3886e+01,   "KstK":4.0345e-01,  "KPiPi":5.0000e+01,  "PiPiPi":5.0000e+01},  "Fixed":True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"NonRes":1.0370e+01,  "PhiPi":5.5372e+00,   "KstK":2.2293e+00,  "KPiPi":7.1828e+00,  "PiPiPi":4.9998e+01},  "Fixed":True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},         "Fixed":True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"NonRes":1.0657e+00,  "PhiPi":1.0562e+00,   "KstK":1.0715e+00,  "KPiPi":1.0365e+00,  "PiPiPi":1.0837e+00}, "Fixed":False}
-
-
-    # combinatorial background                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    #configdict["BsCombinatorialShape"]["type"] = "Exponential"
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"NonRes":-8.5211e-03,  "PhiPi":-5.0873e-03,  "KstK":-8.3392e-03, "KPiPi":-5.0361e-03, "PiPiPi":-5.5277e-03},"Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"NonRes":0.0,       "PhiPi":0.0,       "KstK":0.0,      "KPiPi":0.0,         "PiPiPi":0.0},
-                                                   "Fixed":True }
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"NonRes":4.3067e-01,   "PhiPi":6.5400e-01,   "KstK":3.7409e-01,  "KPiPi":1.0,  "PiPiPi":1.0}, "Fixed":{"KPiPi":True,
-                                                                                                                                                                   "PiPiPi":True}}
-    #configdict["BsCombinatorialShape"]["cB"]   = {"Run1":{"NonRes":-1.1530e-02,  "PhiPi":-9.2354e-03,  "KstK":-1.3675e-02, "KPiPi":-9.8158e-03, "PiPiPi":-1.0890e-03}, "Fixed":False}
-
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal"
-    configdict["DsCombinatorialShape"]["cD"]      = {"Run1": {"NonRes":-4.4329e-03,  "PhiPi":-8.8642e-03,  "KstK":-5.2652e-03, "KPiPi":-5.0743e-03, "PiPiPi":-5.1877e-03},"Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"NonRes":0.88620,      "PhiPi":0.37379,     "KstK":0.59093,      "KPiPi":0.5,         "PiPiPi":0.5},"Fixed":False}
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":True }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK2"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-
-
-    #Bd2Dsh background                                                                                           
-    #shape for BeautyMass, for CharmMass as well as BacPIDK taken by default the same as signal                                                                
-    configdict["Bd2DsKShape"] = {}
-    configdict["Bd2DsKShape"]["BeautyMass"] = {}
-    configdict["Bd2DsKShape"]["BeautyMass"]["type"]    = "ShiftedSignal"
-    configdict["Bd2DsKShape"]["BeautyMass"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2DsKShape"]["BeautyMass"]["scale1"]  = {"Run1": {"All": 0.998944636665}, "Fixed":True}
-    configdict["Bd2DsKShape"]["BeautyMass"]["scale2"]  = {"Run1": {"All": 1.00022181515}, "Fixed":True}
-
-    #                                                                                                                                                                                 
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":1.0, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g2_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g2_f2_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g3_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.75,"Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g5_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.42718, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.50229, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.42718, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.50229, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-
-
-
-    #expected yields                                                                                                                                                              
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bd2DPi"]            = {"2011": {"NonRes":0.9,     "PhiPi":0.0,    "KstK":0.15,   "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":1.6,     "PhiPi":0.1,    "KstK":0.35,   "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Bd2DK"]             = {"2011": {"NonRes":2.0,     "PhiPi":0.2,    "KstK":0.4,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":3.8,     "PhiPi":0.5,    "KstK":0.9,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Lb2LcPi"]           = {"2011": {"NonRes":2.5,     "PhiPi":1.0,    "KstK":0.8,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":5.3,     "PhiPi":2.9,    "KstK":1.7,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Lb2LcK"]            = {"2011": {"NonRes":5.5,     "PhiPi":1.2,    "KstK":1.8,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":13.4,    "PhiPi":2.5,    "KstK":4.3,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Bs2DsDsstKKst"]      = {"2011": {"NonRes":50.0,    "PhiPi":50.0,   "KstK":50.0,   "KPiPi":50.0,   "PiPiPi":50.0},
-                                                  "2012": {"NonRes":100.0,   "PhiPi":100.0,  "KstK":100.0,  "KPiPi":100.0,  "PiPiPi":100.0}, "Fixed":False}
-    configdict["Yields"]["BsLb2DsDsstPPiRho"]  = {"2011": {"NonRes":225.0,   "PhiPi":500.0,  "KstK":330.0,  "KPiPi":90.0,   "PiPiPi":260.0},
-                                                  "2012": {"NonRes":450.0,   "PhiPi":1000.0, "KstK":660.0,  "KPiPi":180.0,  "PiPiPi":260.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]            = {"2011": {"NonRes":1000.0,  "PhiPi":1000.0, "KstK":1000.0, "KPiPi":1000.0, "PiPiPi":1000.0},
-                                                  "2012": {"NonRes":2000.0,  "PhiPi":2000.0, "KstK":2000.0, "KPiPi":2000.0, "PiPiPi":2000.0}, "Fixed":False}
-    configdict["Yields"]["Signal"]             = {"2011": {"NonRes":1000.0,  "PhiPi":1000.0, "KstK":1000.0, "KPiPi":1000.0, "PiPiPi":1000.0},
-                                                  "2012": {"NonRes":2000.0,  "PhiPi":2000.0, "KstK":2000.0, "KPiPi":2000.0, "PiPiPi":2000.0}, "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#            
-    ###                                                               MDfit plotting settings                                                                                 
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------# 
- 
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = { "EPDF": ["Sig", "CombBkg", "Lb2LcK", "Lb2LcPi", "Bd2DK", "Bd2DPi","BsLb2DsDsstPPiRho", "Bs2DsDsstKKst"],
-                                                 "PDF":  ["Sig", "CombBkg", "Lb2LcK", "Lb2LcPi", "Lb2DsDsstP", "Bs2DsDsstPiRho", "Bd2DK", "Bd2DPi","Bs2DsDsstKKst"],
-                                                 "Legend": ["Sig", "CombBkg", "Lb2LcKPi", "Lb2DsDsstP", "Bs2DsDsstPiRho", "Bd2DKPi","Bs2DsDsstKKst"]}
-    configdict["PlotSettings"]["colors"] = { "PDF": [kRed-7, kMagenta-2, kGreen-3, kGreen-3, kYellow-9, kBlue-6, kRed, kRed, kBlue-10],
-                                             "Legend": [kRed-7, kMagenta-2, kGreen-3, kYellow-9, kBlue-6, kRed, kBlue-10]}
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66], 
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitSideband.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitSideband.py
deleted file mode 100644
index 8d1e84c28b3a794047772dee4465c5bac2024834..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitSideband.py
+++ /dev/null
@@ -1,6 +0,0 @@
-def getconfig() :
-
-    from Bs2DsKConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [6000,    7000    ], "InputName" : "lab0_MassFitConsD_M"}
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitUp.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitUp.py
deleted file mode 100644
index 9eaf2ad9778dbeede3aa0ce8dbaa0fd1b54139db..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForNominalMassFitUp.py
+++ /dev/null
@@ -1,250 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bs2DsK"
-    configdict["CharmModes"] = {"NonRes","PhiPi","KstK","KPiPi","PiPiPi"} 
-    configdict["Backgrounds"] = ["Bd2DPi","Bd2DK","Lb2LcK","Lb2LcPi","Bs2DsPi","Bs2DsRho","Bs2DsstPi","Bd2DsK","Lb2Dsp","Lb2Dsstp"]
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2011","2012"} 
-    # stripping (necessary in case of PIDK shapes)
-    configdict["Stripping"] = {"2011":"21r1","2012":"21"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes) 
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.56, "Up": 0.42}, "2012":{"Down": 0.9912, "Up": 0.9988}}
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/Bs2DsK/config_Bs2DsK_newBDTG.txt"
-    #settings for control plots 
-    configdict["ControlPlots"] = {} 
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsK_NewBDTG", "Extension":"pdf"} 
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [1.61,    5.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [ 0.10,    1.0     ], "InputName" : "BDTGResponse_3"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3834, "p1": 0.9720, "average": 0.3813}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4244, "p1": 1.2180, "average": 0.4097}
-
-    HLTcut = "&&(lab0_Hlt1TrackAllL0Decision_TOS && (lab0_Hlt2IncPhiDecision_TOS ==1 || lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1))"
-    # additional cuts applied to data sets
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0&&lab1_PIDmu<2"+HLTcut,            
-                                               "MC" : "lab2_TAU>0&&lab1_M>200&&lab1_PIDK !=-1000.0"+HLTcut, "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9&&lab45_MM<1700", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                     
-    # order of particles: KKPi, KPiPi, PiPiPi                                
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-    #weighting templates by PID eff/misID
-    configdict["WeightingMassTemplates"]= { "PIDBachEff":            { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyKaonEff_5_mu2"},
-                                            "PIDBachMisID":          { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyPionMisID_5_mu2"},
-                                            "PIDBachProtonMisID":    { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyProtonEff_K5_mu2"},
-                                            "PIDChildKaonPionMisID": { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab3_P"], "HistName":"MyPionMisID_0"},
-                                            "PIDChildProtonMisID":   { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"},
-                                                                       "Var":["nTracks","lab4_P"], "HistName":"MyProtonMisID_pKm5_KPi5"},
-                                            "RatioDataMC":{ "FileLabel": {"2011":"#RatioDataMC 2011 PTnTr", "2012": "#RatioDataMC 2012 PTnTr"},
-                                                            "Var":["lab1_PT","nTracks"], "HistName":"histRatio"},
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-    
-    #weighting for PID templates
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[30,30] }
-
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]   = {}
-    configdict["Calibrations"]["2011"]["Proton"]["Up"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]["Down"] = { "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21r1.root"}
-
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsK_Run1_BDTG3.root",
-                                                                  #"FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2011", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsK_Run1_BDTG3.root",
-                                                                    #"FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2011", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]   = {}
-    configdict["Calibrations"]["2012"]["Proton"]["Up"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID5_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]["Down"] = { "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID5_Str21r1.root"}
-
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsK_Run1_BDTG3.root",
-                                                                  #"FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2012", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsK_Run1_BDTG3.root",
-                                                                    #"FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsK_Run1_BDTG3.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2012", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-    
-    # Bs signal shapes                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"NonRes" : 16.3671,   "PhiPi" : 16.291,    "KstK" : 16.1508,   "KPiPi" : 16.2347,   "PiPiPi" : 16.9128},   "Fixed" : True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"NonRes" : 10.8735,   "PhiPi" : 10.9339,   "KstK" : 10.9438,   "KPiPi" : 10.9559,   "PiPiPi" : 11.1463},   "Fixed" : True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"NonRes" : -2.25801,  "PhiPi" : -2.17009,  "KstK" : -2.28933,  "KPiPi" : -2.2631,   "PiPiPi" : -2.26345},  "Fixed" : True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"NonRes" : 2.34818,   "PhiPi" : 2.06867,   "KstK" : 2.17721,   "KPiPi" : 2.14858,   "PiPiPi" : 2.01223},   "Fixed" : True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"NonRes" : 2.82686,   "PhiPi" : 2.96533,   "KstK" : 3.09614,   "KPiPi" : 3.21419,   "PiPiPi" : 3.11023},   "Fixed" : True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"NonRes" : 0.407317,  "PhiPi" : 0.886509,  "KstK" : 0.717488,  "KPiPi" : 0.688164,  "PiPiPi" : 0.887276},  "Fixed" : True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.5,         "PhiPi":0.5,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},         "Fixed":True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"NonRes":1.0663e+00,  "PhiPi":1.1014e+00,  "Kstk":1.0789e+00,  "KPiPi":1.1124e+00,  "PiPiPi":1.0607e+00},  "Fixed":False}
-
-    #Ds signal shapes                                                                                                
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"NonRes" : 5.28549,   "PhiPi" : 5.33497,    "KstK" : 5.73149,   "KPiPi" : 6.54633,   "PiPiPi" : 7.92704},   "Fixed" : True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"NonRes" : 6.10816,   "PhiPi" : 5.7301,     "KstK" : 5.95999,   "KPiPi" : 7.61983,   "PiPiPi" : 8.68266},   "Fixed" : True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"NonRes" : -1.19829,  "PhiPi" : -1.0928,    "KstK" : -1.23869,  "KPiPi" : -1.18576,  "PiPiPi" : -1.03718},  "Fixed" : True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"NonRes" : 1.22329,   "PhiPi" : 1.15676,    "KstK" : 1.2273,    "KPiPi" : 1.10872,   "PiPiPi" : 0.815563},  "Fixed" : True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"NonRes" : 8.17318,   "PhiPi" : 10.1772,    "KstK" : 10.1878,   "KPiPi" : 10.0,      "PiPiPi" : 19.9973},   "Fixed" : True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"NonRes" : 5.23555,   "PhiPi" : 5.72422,    "KstK" : 6.20116,   "KPiPi" : 8.84269,   "PiPiPi" : 48.4227},   "Fixed" : True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},        "Fixed":True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"NonRes":1.0657e+00,  "PhiPi":1.0562e+00,   "KstK":1.0715e+00,  "KPiPi":1.0365e+00,  "PiPiPi":1.0837e+00}, "Fixed":False}
-
-
-    # combinatorial background                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    #configdict["BsCombinatorialShape"]["type"] = "Exponential"
-    #configdict["BsCombinatorialShape"]["cB"]   = {"Run1":{"NonRes":-1.1530e-02,  "PhiPi":-9.2354e-03,  "KstK":-1.3675e-02, "KPiPi":-9.8158e-03, "PiPiPi":-1.0890e-03}, "Fixed":False}
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"NonRes":-3.5211e-02,  "PhiPi":-3.0873e-02,  "KstK":-2.3392e-02, "KPiPi":-1.0361e-02, "PiPiPi":-1.5277e-02},"Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"NonRes":0.0,       "PhiPi":0.0,       "KstK":0.0,      "KPiPi":0.0,         "PiPiPi":0.0},
-                                                   "Fixed":True }
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"NonRes":4.3067e-01,   "PhiPi":6.5400e-01,   "KstK":3.7409e-01,  "KPiPi":1.0,  "PiPiPi":1.0}, "Fixed":{"KPiPi":True, 
-                                                                                                                                                                   "PiPiPi":True}}
-
-
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" #"ExponentialPlusDoubleCrystalBallWithWidthRatioSharedMean"
-    configdict["DsCombinatorialShape"]["cD"]      = {"Run1": {"NonRes":-4.4329e-03,  "PhiPi":-8.8642e-03,  "KstK":-5.2652e-03, "KPiPi":-5.0743e-03, "PiPiPi":-5.1877e-03},"Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"NonRes":0.88620,      "PhiPi":0.37379,     "KstK":0.59093,      "KPiPi":0.5,         "PiPiPi":0.5},"Fixed":False}
-
-    
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":True }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK2"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-
-
-    #Bd2Dsh background                                                                                           
-    #shape for BeautyMass, for CharmMass as well as BacPIDK taken by default the same as signal                                                                
-    configdict["Bd2DsKShape"] = {}
-    configdict["Bd2DsKShape"]["BeautyMass"] = {}
-    configdict["Bd2DsKShape"]["BeautyMass"]["type"]    = "ShiftedSignal"
-    configdict["Bd2DsKShape"]["BeautyMass"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2DsKShape"]["BeautyMass"]["scale1"]  = {"Run1": {"All": 0.998944636665}, "Fixed":True}
-    configdict["Bd2DsKShape"]["BeautyMass"]["scale2"]  = {"Run1": {"All": 1.00022181515}, "Fixed":True}
-
-    #                                                                                                                                                                                 
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":1.0, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g2_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g2_f2_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g3_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.75,"Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["g5_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.42718, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.50229, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.42718, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.50229, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-
-
-
-    #expected yields                                                                                                                                                              
-    configdict["Yields"] = {}
-    #configdict["Yields"]["Bd2DPi"]            = {"2011": {"NonRes":17.4,    "PhiPi":0.8,    "KstK":12.1,   "KPiPi":0.0,    "PiPiPi":0.0},
-    #                                             "2012": {"NonRes":32.6,    "PhiPi":1.8,    "KstK":26.5,   "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    #configdict["Yields"]["Bd2DK"]             = {"2011": {"NonRes":26.1,    "PhiPi":1.4,    "KstK":19.2,   "KPiPi":0.0,    "PiPiPi":0.0},
-    #                                             "2012": {"NonRes":57.0,    "PhiPi":3.2,    "KstK":46.4,   "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    #configdict["Yields"]["Lb2LcPi"]           = {"2011": {"NonRes":9.0,     "PhiPi":1.3,    "KstK":2.6,    "KPiPi":0.0,    "PiPiPi":0.0},
-    #                                             "2012": {"NonRes":18.1,    "PhiPi":2.9,    "KstK":5.4,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    #configdict["Yields"]["Lb2LcK"]            = {"2011": {"NonRes":13.6,    "PhiPi":2.2,    "KstK":4.1,    "KPiPi":0.0,    "PiPiPi":0.0},
-    #                                             "2012": {"NonRes":31.7,    "PhiPi":5.2,    "KstK":9.5,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    
-    configdict["Yields"]["Bd2DPi"]            = {"2011": {"NonRes":0.7,     "PhiPi":0.0,    "KstK":0.1,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":1.6,     "PhiPi":0.0,    "KstK":0.3,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Bd2DK"]             = {"2011": {"NonRes":1.7,     "PhiPi":0.1,    "KstK":0.3,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":3.8,     "PhiPi":0.3,    "KstK":0.8,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Lb2LcPi"]           = {"2011": {"NonRes":2.1,     "PhiPi":0.5,    "KstK":0.6,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":5.4,     "PhiPi":1.0,    "KstK":1.7,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Lb2LcK"]            = {"2011": {"NonRes":4.7,     "PhiPi":1.0,    "KstK":1.5,    "KPiPi":0.0,    "PiPiPi":0.0},
-                                                 "2012": {"NonRes":13.4,    "PhiPi":2.5,    "KstK":4.3,    "KPiPi":0.0,    "PiPiPi":0.0}, "Fixed":True}
-
-
-    configdict["Yields"]["Bs2DsDsstKKst"]      = {"2011": {"NonRes":500.0,    "PhiPi":500.0,   "KstK":500.0,   "KPiPi":500.0,   "PiPiPi":500.0},
-                                                  "2012": {"NonRes":1000.0,   "PhiPi":1000.0,  "KstK":1000.0,  "KPiPi":1000.0,  "PiPiPi":1000.0}, "Fixed":False}
-    configdict["Yields"]["BsLb2DsDsstPPiRho"]  = {"2011": {"NonRes":2250.0,   "PhiPi":5000.0,  "KstK":3300.0,  "KPiPi":900.0,   "PiPiPi":2600.0},
-                                                  "2012": {"NonRes":4500.0,   "PhiPi":10000.0, "KstK":6600.0,  "KPiPi":1800.0,  "PiPiPi":2600.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]            = {"2011": {"NonRes":10000.0,  "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                                  "2012": {"NonRes":20000.0,  "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0}, "Fixed":False}
-    configdict["Yields"]["Signal"]             = {"2011": {"NonRes":1000.0,  "PhiPi":1000.0, "KstK":1000.0, "KPiPi":1000.0, "PiPiPi":1000.0},
-                                                  "2012": {"NonRes":2000.0,  "PhiPi":2000.0, "KstK":2000.0, "KPiPi":2000.0, "PiPiPi":2000.0}, "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#            
-    ###                                                               MDfit plotting settings                                                                                 
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------# 
- 
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = { "EPDF": ["Sig", "CombBkg", "Lb2LcK", "Lb2LcPi", "Bd2DK", "Bd2DPi","BsLb2DsDsstPPiRho", "Bs2DsDsstKKst"],
-                                                 "PDF":  ["Sig", "CombBkg", "Lb2LcK", "Lb2LcPi", "Lb2DsDsstP", "Bs2DsDsstPiRho", "Bd2DK", "Bd2DPi","Bs2DsDsstKKst"],
-                                                 "Legend": ["Sig", "CombBkg", "Lb2LcKPi", "Lb2DsDsstP", "Bs2DsDsstPiRho", "Bd2DKPi","Bs2DsDsstKKst"]}
-    configdict["PlotSettings"]["colors"] = { "PDF": [kRed-7, kMagenta-2, kGreen-3, kGreen-3, kYellow-9, kBlue-6, kRed, kRed, kBlue-10],
-                                             "Legend": [kRed-7, kMagenta-2, kGreen-3, kYellow-9, kBlue-6, kRed, kBlue-10]}
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66], 
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForToyGenerator.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForToyGenerator.py
deleted file mode 100644
index 4a5b24340b5accbcf29f468bacaf87f3d6c2d4bc..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/Bs2DsKConfigForToyGenerator.py
+++ /dev/null
@@ -1,1134 +0,0 @@
-from __future__ import division
-from past.utils import old_div
-def getconfig() :
-
-    configdict = {}
-
-    ############################################################
-    #List of observables for all the PDFs.
-    #The content of this dictionary determines the observables
-    #to generate for and how may taggers are present.
-    ############################################################
-    
-    configdict["Observables"] = {}
-    configdict["Observables"] = {"BeautyMass":    {"Type"  : "RooRealVar",
-                                                   "Title" : "B mass (MeV/c^2)",
-                                                   "Range" : [5300, 5800]},
-                                 "CharmMass":     {"Type" : "RooRealVar",
-                                                   "Title" : "D mass (MeV/c^2)",
-                                                   "Range" : [1930, 2015]},
-                                 "BacPIDK":       {"Type"  : "RooRealVar",
-                                                   "Title": "log(fabs(PIDK))",
-                                                   "Range": [1.61,    5.0]}, 
-                                 "BeautyTime":    {"Type" : "RooRealVar",
-                                                   "Title" : "B decay time (ps)",
-                                                   "Range" : [0.4, 15.0]},
-                                 "BeautyTimeErr": {"Type" : "RooRealVar",
-                                                   "Title" : "B decay time error (ps)",
-                                                   "Range" : [0.01, 0.1]},
-                                 "BacCharge":     {"Type"  : "RooCategory",
-                                                   "Title" : "Bachelor charge",
-                                                   "Categories": { "h+" : +1,
-                                                                   "h-" : -1}},
-                                 "MistagOS":      {"Type" : "RooRealVar",
-                                                   "Title" : "#eta_{OS}",
-                                                   "Range" : [0.0,0.5]},
-                                 "MistagSS":      {"Type" : "RooRealVar",
-                                                   "Title" : "#eta_{SS}",
-                                                   "Range" : [0.0,0.5]},
-                                 "TrueID":        {"Type" : "RooRealVar",
-                                                   "Title" : "True component ID",
-                                                   "Range" : [0.0,1500.0]},
-                                 "TagDecOS":      {"Type"  : "RooCategory",
-                                                   "Title" : "q_{t}^{OS}",
-                                                   "Categories": { "B+"       : +1,
-                                                                   "Untagged" : 0,
-                                                                   "B-"       : -1}},
-                                 "TagDecSS":      {"Type"  : "RooCategory",
-                                                   "Title" : "q_{t}^{SS}",
-                                                   "Categories": { "B+"       : +1,
-                                                                   "Untagged" : 0,
-                                                                   "B-"       : -1}}
-                                 }
-
-    ############################################################ 
-    #List of mass hypotheses for bachelor
-    #The content of this dictionary determines how many
-    #bachelor PID bins the final dataset is splitted into
-    ############################################################
-    
-    configdict["Hypothesys"] = ["Bs2DsK"]
-
-    ############################################################
-    #Signal decay, Charm decay mode and year of data taking
-    #Splitting per magnet polarity not implemented, at the moment
-    ############################################################
-
-    configdict["Decay"] = "Bs2DsK"
-    configdict["CharmModes"] = ["NonRes","PhiPi","KstK","KPiPi","PiPiPi"]
-    configdict["Years"] = ["2011","2012"]
-    configdict["MergedYears"] = True
-    
-
-    ############################################################
-    #For PIDK shapes we need also polarities
-    ############################################################
-    configdict["Polarity"] = ["Up","Down"]
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.50, "Up": 0.50}, "2012":{"Down": 1.000, "Up": 1.000}}
-    configdict["FractionsLuminosity"] = {"2011": (old_div(configdict["IntegratedLuminosity"]["2011"]["Up"],(configdict["IntegratedLuminosity"]["2011"]["Up"] + configdict["IntegratedLuminosity"]["2011"]["Down"]))),
-                                         "2012": (old_div(configdict["IntegratedLuminosity"]["2012"]["Up"],(configdict["IntegratedLuminosity"]["2012"]["Up"] + configdict["IntegratedLuminosity"]["2012"]["Down"])))}
-    
-    lum2011 =  configdict["IntegratedLuminosity"]["2011"]["Up"] + configdict["IntegratedLuminosity"]["2011"]["Down"] 
-    lum2012 =  configdict["IntegratedLuminosity"]["2012"]["Up"] + configdict["IntegratedLuminosity"]["2012"]["Down"]
-    fracRun1 = old_div(lum2011,(lum2011 + lum2012)) 
-    
-    configdict["WorkspaceToRead"] = {"File":"/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                     "Workspace" : "workspace"}
-
-    ############################################################ 
-    #List of components with yields to generate.
-    #The content of this dictionary determines, for each
-    #PID bin and year, how many PDF components are generated.
-    #If there is only signal, a TTree ready for sFit is
-    #generated directly, without need for doing a (useless)
-    #mass fit.
-    ############################################################
-    
-    #configdict["Components"] = {}
-    #configdict["Components"]["Signal"] = {}
-    configdict["Components"] = {"Signal":        {"Bs2DsK": {"2011": {"NonRes": [931*fracRun1], "PhiPi":[1956*fracRun1], 
-                                                                       "KstK"  : [1611*fracRun1], "KPiPi":[385*fracRun1],  "PiPiPi":[931*fracRun1] },
-                                                              "2012": {"NonRes": [931*(1.0-fracRun1)], "PhiPi":[1956*(1.0-fracRun1)], 
-                                                                       "KstK"  : [1611*(1.0-fracRun1)], "KPiPi":[385*(1.0-fracRun1)],  "PiPiPi":[931*(1.0-fracRun1)] }}},
-                                "Combinatorial": {"Bs2DsK": {"2011": {"NonRes": [900*fracRun1],  "PhiPi":[801*fracRun1],  
-                                                                       "KstK"  : [508*fracRun1],  "KPiPi":[909*fracRun1],  "PiPiPi":[2000*fracRun1] },
-                                                              "2012": {"NonRes": [900*(1.0-fracRun1)],  "PhiPi":[801*(1.0-fracRun1)],  
-                                                                       "KstK"  : [508*(1.0-fracRun1)],  "KPiPi":[909*(1.0-fracRun1)],  "PiPiPi":[2000*(1.0-fracRun1)] }}},
-
-	                	"Bs2DsPi":       {"Bs2DsK": {"2011": {"NonRes": [392.9*fracRun1], "PhiPi":[827.0*fracRun1], 
-                                                                      "KstK"  : [631.9*fracRun1], "KPiPi":[117*fracRun1], "PiPiPi":[443*fracRun1] },
-                                                             "2012": {"NonRes": [392.9*(1.0-fracRun1)], "PhiPi":[827.0*(1.0-fracRun1)], 
-                                                                      "KstK"  : [631.9*(1.0-fracRun1)], "KPiPi":[117*(1.0-fracRun1)], "PiPiPi":[443*(1.0-fracRun1)] }}},    
-				"Bs2DsstPi":     {"Bs2DsK": {"2011": {"NonRes": [134.3*fracRun1], "PhiPi":[282.6*fracRun1], 
-                                                                      "KstK"  : [216.0*fracRun1], "KPiPi":[40.0*fracRun1], "PiPiPi":[151.6*fracRun1] },
-                                                             "2012": {"NonRes": [134.3*(1.0-fracRun1)], "PhiPi":[282.6*(1.0-fracRun1)], 
-                                                                      "KstK"  : [216.0*(1.0-fracRun1)], "KPiPi":[40.0*(1.0-fracRun1)], "PiPiPi":[151*(1.0-fracRun1)] }}},   
-				"Bs2DsRho":      {"Bs2DsK": {"2011": {"NonRes": [134.3*fracRun1], "PhiPi":[282.6*fracRun1], 
-                                                                      "KstK"  : [216.0*fracRun1], "KPiPi":[40.0*fracRun1], "PiPiPi":[151*fracRun1] },
-                                                             "2012": {"NonRes": [134.3*(1.0-fracRun1)], "PhiPi":[282.6*(1.0-fracRun1)], 
-                                                                      "KstK"  : [216.0*(1.0-fracRun1)], "KPiPi":[40.0*(1.0-fracRun1)], "PiPiPi":[151*(1.0-fracRun1)] }}},     
-                                
-				"Bd2DPi":        {"Bs2DsK": {"2011": {"NonRes" : [50*fracRun1],    "PhiPi":[2.6*fracRun1],  
-                                                                       "KstK"  : [38.6*fracRun1],  "KPiPi":[0.0*fracRun1],   "PiPiPi":[0.0*fracRun1] },
-                                                              "2012": {"NonRes": [50*(1.0-fracRun1)],    "PhiPi":[2.6*(1.0-fracRun1)],  
-                                                                       "KstK"  : [38.6*(1.0-fracRun1)],  "KPiPi":[0.0*(1.0-fracRun1)],   "PiPiPi":[0.0*(1.0-fracRun1)] }}},
-                                "Bd2DK":        {"Bs2DsK": {"2011": {"NonRes"  : [83.1*fracRun1],  "PhiPi":[4.6*fracRun1],  
-                                                                       "KstK"  : [65.6*fracRun1],  "KPiPi":[0.0*fracRun1],   "PiPiPi":[0.0*fracRun1] },
-                                                              "2012": {"NonRes": [83.1*(1.0-fracRun1)],  "PhiPi":[4.6*(1.0-fracRun1)],  
-                                                                       "KstK"  : [65.6*(1.0-fracRun1)],  "KPiPi":[0.0*(1.0-fracRun1)],   "PiPiPi":[0.0*(1.0-fracRun1)] }}},
-
-				"Lb2LcPi":       {"Bs2DsK": {"2011": {"NonRes" : [27.1*fracRun1],  "PhiPi":[4.2*fracRun1],   
-                                                                       "KstK"  : [8.0*fracRun1],   "KPiPi":[0.0*fracRun1],       "PiPiPi":[0.0*fracRun1] },
-                                                             "2012": {"NonRes" : [27.1*(1.0-fracRun1)], "PhiPi":[4.2*(1.0-fracRun1)],   
-                                                                      "KstK"   : [8.0*(1.0 - fracRun1)],    "KPiPi" : [0.0*(1.0-fracRun1)],   "PiPiPi":[0.0*(1.0-fracRun1)] }}}, 
-                                "Lb2LcK":       {"Bs2DsK": {"2011": {"NonRes"  : [45.3*fracRun1],   "PhiPi":[7.4*fracRun1],   
-                                                                     "KstK"    : [13.6*fracRun1],    "KPiPi":[0.0*fracRun1],   "PiPiPi":[0.0*fracRun1] },
-                                                            "2012": {"NonRes"  : [45.3*(1.0-fracRun1)],   "PhiPi":[7.4*(1.0-fracRun1)],   
-                                                                     "KstK"    : [13.6*(1.0 - fracRun1)], "KPiPi" : [0.0*(1.0-fracRun1)],   "PiPiPi":[0.0*(1.0-fracRun1)] }}},    
-                                
-     				"Lb2Dsp":       {"Bs2DsK": {"2011": {"NonRes": [26.7*fracRun1],  "PhiPi":[56.1*fracRun1],   
-                                                                     "KstK"  : [42.9*fracRun1],   "KPiPi":[7.9*fracRun1],   "PiPiPi":[30.0*fracRun1] },
-                                                            "2012": {"NonRes": [26.7*(1.0-fracRun1)],   "PhiPi":[56.1*(1.0-fracRun1)],   
-                                                                     "KstK"  : [42.9*(1.0 - fracRun1)], "KPiPi" : [7.9*(1.0-fracRun1)],   "PiPiPi":[30.0*(1.0-fracRun1)] }}}, 
-                                "Lb2Dsstp":       {"Bs2DsK": {"2011": {"NonRes": [8.9*fracRun1], "PhiPi":[19*fracRun1],   
-                                                                       "KstK"  : [14.3*fracRun1], "KPiPi":[2.6*fracRun1],   "PiPiPi":[10.0*fracRun1] },
-                                                              "2012": {"NonRes": [8.9*(1.0-fracRun1)], "PhiPi":[19*(1.0-fracRun1)],   
-                                                                       "KstK"  : [14.3*(1.0 - fracRun1)],  "KPiPi" : [2.6*(1.0-fracRun1)],   "PiPiPi":[10.0*(1.0-fracRun1)] }}},    
-
-                                "Bd2DsK":       {"Bs2DsK": {"2011": {"NonRes": [22*fracRun1],    "PhiPi":[57*fracRun1],    
-                                                                     "KstK"  : [50*fracRun1],    "KPiPi":[18*fracRun1],    "PiPiPi":[32*fracRun1] },
-                                                            "2012": {"NonRes": [22*(1.0-fracRun1)],    "PhiPi":[57*(1.0-fracRun1)],    
-                                                                     "KstK"  : [50*(1.0-fracRun1)],    "KPiPi":[18*(1.0-fracRun1)],    "PiPiPi":[32*(1.0-fracRun1)] }}}}
-                                
-
-    ############################################################
-    #"Code" to identify the True ID for each component
-    ############################################################
-
-    configdict["TrueID"] = {}
-    configdict["TrueID"] = {"Signal"        : 100,
-                            "Combinatorial" : 200,
-	                    "Bs2DsPi"       : 300,
-	                    "Bs2DsstPi"     : 400,
-	                    "Bs2DsRho"      : 500, 
-                            "Bd2DPi"        : 600,
-		            "Bd2DK"         : 700, 
-                            "Lb2LcPi"       : 800,
-                            "Lb2LcK"        : 900, 
-                            "Lb2Dsp"        :1000,
-                            "Lb2Dsstp"      :1100,
-                            "Bd2DsK"        :1200}
-
-    ############################################################
-    #List of PDFs for "time-independent" observables
-    #Dictionary structure: observable->component->bachelor hypo->year->D mode
-    ############################################################
-
-    ############################################################
-    #                      Signal                               
-    ############################################################
-
-    ############################################################
-    configdict["PDFList"] = {}
-    configdict["PDFList"]["BeautyMass"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"] = {} 
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"] =  {"Type" : "DoubleCrystalBall",
-                                                                                   "mean":[5365.51], "sigma1":[1.4463e+01], "sigma2": [1.0932e+01], "alpha1": [-2.1830e+00],
-                                                                                   "alpha2":[1.7323e+00], "n1":[2.7064e+00], "n2":[1.5260e+00], "frac":[0.5]}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"] =  {"Type" : "DoubleCrystalBall",
-                                                                                   "mean":[5365.51], "sigma1":[1.6022e+01], "sigma2": [1.0656e+01], "alpha1": [-2.2974e+00],
-                                                                                   "alpha2":[2.5001e+00], "n1":[3.5139e+00], "n2":[2.9885e-01],"frac":[0.5]}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                  "mean":[5365.51], "sigma1":[1.6527e+01], "sigma2": [1.0469e+01], "alpha1": [-2.3682e+00],
-                                                                                  "alpha2":[2.6768e+00], "n1":[1.8813e+00], "n2":[1.1171e-01],"frac":[0.5]}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                  "mean":[5365.51], "sigma1":[1.5252e+01], "sigma2": [1.0961e+01], "alpha1": [-2.6083e+00],
-                                                                                  "alpha2":[1.8731e+00], "n1":[1.6047e+00], "n2":[1.2051e+00],"frac":[0.5]}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                   "mean":[5365.51], "sigma1":[1.6541e+01], "sigma2": [1.0652e+01], "alpha1": [-2.3757e+00],
-                                                                                   "alpha2":[1.8091e+00], "n1":[3.2171e+00], "n2":[1.3755e+00],"frac":[0.5]}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"] =  {"Type" : "DoubleCrystalBall",
-                                                                                   "mean":[5365.51], "sigma1":[1.4463e+01], "sigma2": [1.0932e+01], "alpha1": [-2.1830e+00],
-                                                                                   "alpha2":[1.7323e+00], "n1":[2.7064e+00], "n2":[1.5260e+00],"frac":[0.5]}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"] =  {"Type" : "DoubleCrystalBall",
-                                                                                 "mean":[5365.51], "sigma1":[1.6022e+01], "sigma2": [1.0656e+01], "alpha1": [-2.2974e+00],
-                                                                                 "alpha2":[2.5001e+00], "n1":[3.5139e+00], "n2":[2.9885e-01],"frac":[0.5]}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                  "mean":[5365.51], "sigma1":[1.6527e+01], "sigma2": [1.0469e+01], "alpha1": [-2.3682e+00],
-                                                                                  "alpha2":[2.6768e+00], "n1":[1.8813e+00], "n2":[1.1171e-01],"frac":[0.5]}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                  "mean":[5365.51], "sigma1":[1.5252e+01], "sigma2": [1.0961e+01], "alpha1": [-2.6083e+00],
-                                                                                  "alpha2":[1.8731e+00], "n1":[1.6047e+00], "n2":[1.2051e+00],"frac":[0.5]}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                   "mean":[5365.51], "sigma1":[1.6541e+01], "sigma2": [1.0652e+01], "alpha1": [-2.3757e+00],
-                                                                                   "alpha2":[1.8091e+00], "n1":[3.2171e+00], "n2":[1.3755e+00],"frac":[0.5]}
-    
-    ############################################################### 
-    configdict["PDFList"]["CharmMass"] = {}
-    configdict["PDFList"]["CharmMass"]["Signal"] = {}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"] = {}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"] =  {"Type" : "DoubleCrystalBall",
-                                                                                   "mean":[1968.49], "sigma1":[4.7027e+00], "sigma2": [7.3516e+00], "alpha1": [-1.9272e+00],
-                                                                                   "alpha2":[1.8145e+00], "n1":[2.3283e+00], "n2":[2.5187e+00], "frac":[0.5]}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                 "mean":[1968.49], "sigma1":[4.5595e+00], "sigma2": [7.5857e+00], "alpha1": [-2.1355e+00],
-                                                                                 "alpha2":[1.7106e+00], "n1":[1.6544e+00], "n2":[3.5765e+00], "frac":[0.5]}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"] =  {"Type" : "DoubleCrystalBall",
-                                                                                "mean":[1968.49], "sigma1":[4.7236e+00], "sigma2": [7.4875e+00], "alpha1": [-1.9435e+00],
-                                                                                "alpha2":[1.7592e+00], "n1":[2.4362e+00], "n2":[3.9442e+00], "frac":[0.5]}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                 "mean":[1968.49], "sigma1":[7.8797e+00], "sigma2": [6.4160e+00], "alpha1": [-1.3572e+00],
-                                                                                 "alpha2":[1.6532e+00], "n1":[2.8660e+01], "n2":[1.8414e+00], "frac":[0.5]}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                  "mean":[1968.49], "sigma1":[7.6187e+00], "sigma2": [8.4359e+00], "alpha1": [-1.0018e+00],
-                                                                                  "alpha2":[8.6154e-01], "n1":[4.5603e+01], "n2":[5.0000e+01], "frac":[0.5]}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"] =  {"Type" : "DoubleCrystalBall",
-                                                                                   "mean":[1968.49], "sigma1":[4.7027e+00], "sigma2": [7.3516e+00], "alpha1": [-1.9272e+00],
-                                                                                   "alpha2":[1.8145e+00], "n1":[2.3283e+00], "n2":[2.5187e+00], "frac":[0.5]}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                 "mean":[1968.49], "sigma1":[4.5595e+00], "sigma2": [7.5857e+00], "alpha1": [-2.1355e+00],
-                                                                                 "alpha2":[1.7106e+00], "n1":[1.6544e+00], "n2":[3.5765e+00], "frac":[0.5]}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"] =  {"Type" : "DoubleCrystalBall",
-                                                                                "mean":[1968.49], "sigma1":[4.7236e+00], "sigma2": [7.4875e+00], "alpha1": [-1.9435e+00],
-                                                                                "alpha2":[1.7592e+00], "n1":[2.4362e+00], "n2":[3.9442e+00], "frac":[0.5]}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                 "mean":[1968.49], "sigma1":[7.8797e+00], "sigma2": [6.4160e+00], "alpha1": [-1.3572e+00],
-                                                                                 "alpha2":[1.6532e+00], "n1":[2.8660e+01], "n2":[1.8414e+00], "frac":[0.5]}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                  "mean":[1968.49], "sigma1":[7.6187e+00], "sigma2": [8.4359e+00], "alpha1": [-1.0018e+00],
-                                                                                  "alpha2":[8.6154e-01], "n1":[4.5603e+01], "n2":[5.0000e+01], "frac":[0.5]}
-    ###############################################################
-    configdict["PDFList"]["BacPIDK"] = {}
-    configdict["PDFList"]["BacPIDK"]["Signal"] = {}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2011"]["NonRes"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",  
-                                                                               "Name": {"Up": "PIDKShape_Bs2DsK_up_nonres_2011", "Down":"PIDKShape_Bs2DsK_down_nonres_2011"}}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": {"Up": "PIDKShape_Bs2DsK_up_phipi_2011", "Down":"PIDKShape_Bs2DsK_down_phipi_2011"}}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2011"]["KstK"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": {"Up": "PIDKShape_Bs2DsK_up_kstk_2011", "Down":"PIDKShape_Bs2DsK_down_kstk_2011"}}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": {"Up": "PIDKShape_Bs2DsK_up_kpipi_2011", "Down":"PIDKShape_Bs2DsK_down_kpipi_2011"}}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": {"Up": "PIDKShape_Bs2DsK_up_pipipi_2011", "Down":"PIDKShape_Bs2DsK_down_pipipi_2011"}}
-
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2012"]["NonRes"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": {"Up": "PIDKShape_Bs2DsK_up_nonres_2012", "Down":"PIDKShape_Bs2DsK_down_nonres_2012"}}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": {"Up": "PIDKShape_Bs2DsK_up_phipi_2012", "Down":"PIDKShape_Bs2DsK_down_phipi_2012"}}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2012"]["KstK"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": {"Up": "PIDKShape_Bs2DsK_up_kstk_2012", "Down":"PIDKShape_Bs2DsK_down_kstk_2012"}}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": {"Up": "PIDKShape_Bs2DsK_up_kpipi_2012", "Down":"PIDKShape_Bs2DsK_down_kpipi_2012"}}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": {"Up": "PIDKShape_Bs2DsK_up_pipipi_2012", "Down":"PIDKShape_Bs2DsK_down_pipipi_2012"}}
-
-    ############################################################    
-    #                      Combinatorial      
-    ############################################################   
-
-    ############################################################
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"] = {}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsK"]["2011"]["NonRes"] = {"Type":"Exponential", "cB":[-4.8467e-03]}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsK"]["2011"]["PhiPi"]  = {"Type":"Exponential", "cB":[-1.2569e-02]}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsK"]["2011"]["KstK"]   = {"Type":"Exponential", "cB":[-4.2236e-03]}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsK"]["2011"]["KPiPi"]  = {"Type":"Exponential", "cB":[-8.3869e-03]}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsK"]["2011"]["PiPiPi"] = {"Type":"Exponential", "cB":[-6.2744e-03]}
-
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsK"]["2012"]["NonRes"] = {"Type":"Exponential", "cB":[-4.8467e-03]}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsK"]["2012"]["PhiPi"]  = {"Type":"Exponential", "cB":[-1.2569e-02]}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsK"]["2012"]["KstK"]   = {"Type":"Exponential", "cB":[-4.2236e-03]}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsK"]["2012"]["KPiPi"]  = {"Type":"Exponential", "cB":[-8.3869e-03]}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsK"]["2012"]["PiPiPi"] = {"Type":"Exponential", "cB":[-6.2744e-03]}
-
-    ############################################################
-    
-    configdict["PDFList"]["CharmMass"]["Combinatorial"] = {}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsK"] = {}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsK"]["2011"]["NonRes"] = {"Type":"ExponentialPlusDoubleCrystalBall",
-                                                                                        "mean"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]["mean"][0]], 
-                                                                                        "sigma1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]["sigma1"][0]], 
-                                                                                        "sigma2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]["sigma2"][0]], 
-                                                                                        "alpha1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]["alpha1"][0]],
-                                                                                        "alpha2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]["alpha2"][0]], 
-                                                                                        "n1"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]["n1"][0]], 
-                                                                                        "n2"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]["n2"][0]], 
-                                                                                        "frac"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]["frac"][0]],
-                                                                                        "cB"    : [-5.0833e-03], "fracD":[4.9069e-01]}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsK"]["2011"]["PhiPi"] = {"Type":"ExponentialPlusDoubleCrystalBall",
-                                                                                       "mean"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]["mean"][0]],
-                                                                                       "sigma1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]["sigma1"][0]],
-                                                                                       "sigma2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]["sigma2"][0]],
-                                                                                       "alpha1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]["alpha1"][0]],
-                                                                                       "alpha2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]["alpha2"][0]],
-                                                                                       "n1"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]["n1"][0]],
-                                                                                       "n2"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]["n2"][0]],
-                                                                                       "frac"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]["frac"][0]],
-                                                                                      "cB"     : [-1.1455e-02], "fracD":[7.6156e-01]}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsK"]["2011"]["KstK"] = {"Type":"ExponentialPlusDoubleCrystalBall",
-                                                                                      "mean"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]["mean"][0]],
-                                                                                      "sigma1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]["sigma1"][0]],
-                                                                                      "sigma2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]["sigma2"][0]],
-                                                                                      "alpha1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]["alpha1"][0]],
-                                                                                      "alpha2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]["alpha2"][0]],
-                                                                                      "n1"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]["n1"][0]],
-                                                                                      "n2"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]["n2"][0]],
-                                                                                      "frac"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]["frac"][0]],
-                                                                                      "cB"    : [-1.2313e-02], "fracD":[6.0568e-01]}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsK"]["2011"]["KPiPi"] = {"Type":"ExponentialPlusDoubleCrystalBall",
-                                                                                       "mean"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]["mean"][0]],
-                                                                                       "sigma1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]["sigma1"][0]],
-                                                                                       "sigma2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]["sigma2"][0]],
-                                                                                       "alpha1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]["alpha1"][0]],
-                                                                                       "alpha2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]["alpha2"][0]],
-                                                                                       "n1"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]["n1"][0]],
-                                                                                       "n2"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]["n2"][0]],       
-                                                                                       "frac"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]["frac"][0]],
-                                                                                       "cB"    : [-2.1421e-03], "fracD":[6.5957e-01]}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsK"]["2011"]["PiPiPi"] = {"Type":"ExponentialPlusDoubleCrystalBall",
-                                                                                        "mean"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]["mean"][0]],
-                                                                                        "sigma1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]["sigma1"][0]],
-                                                                                        "sigma2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]["sigma2"][0]],
-                                                                                        "alpha1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]["alpha1"][0]],
-                                                                                        "alpha2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]["alpha2"][0]],
-                                                                                        "n1"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]["n1"][0]],
-                                                                                        "n2"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]["n2"][0]],
-                                                                                        "frac"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]["frac"][0]],
-                                                                                        "cB"    : [-5.3817e-03], "fracD":[7.5167e-01]}
-    
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsK"]["2012"]["NonRes"] = {"Type":"ExponentialPlusDoubleCrystalBall",
-                                                                                        "mean"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]["mean"][0]],
-                                                                                        "sigma1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]["sigma1"][0]],
-                                                                                        "sigma2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]["sigma2"][0]],
-                                                                                        "alpha1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]["alpha1"][0]],
-                                                                                        "alpha2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]["alpha2"][0]],
-                                                                                        "n1"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]["n1"][0]],
-                                                                                        "n2"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]["n2"][0]],
-                                                                                        "frac"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]["frac"][0]],
-                                                                                        "cB"    : [-5.0833e-03], "fracD":[4.9069e-01]}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsK"]["2012"]["PhiPi"] = {"Type":"ExponentialPlusDoubleCrystalBall",
-                                                                                       "mean"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]["mean"][0]],
-                                                                                       "sigma1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]["sigma1"][0]],
-                                                                                       "sigma2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]["sigma2"][0]],
-                                                                                       "alpha1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]["alpha1"][0]],
-                                                                                       "alpha2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]["alpha2"][0]],
-                                                                                       "n1"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]["n1"][0]],
-                                                                                       "n2"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]["n2"][0]],
-                                                                                       "frac"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]["frac"][0]],
-                                                                                       "cB"    : [-1.1455e-02], "fracD":[7.6156e-01] }
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsK"]["2012"]["KstK"] = {"Type":"ExponentialPlusDoubleCrystalBall",
-                                                                                      "mean"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]["mean"][0]],
-                                                                                      "sigma1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]["sigma1"][0]],
-                                                                                      "sigma2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]["sigma2"][0]],
-                                                                                      "alpha1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]["alpha1"][0]],
-                                                                                      "alpha2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]["alpha2"][0]],
-                                                                                      "n1"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]["n1"][0]],
-                                                                                      "n2"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]["n2"][0]],
-                                                                                      "frac"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]["frac"][0]],
-                                                                                      "cB"    : [-1.2313e-02], "fracD":[6.0568e-01]}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsK"]["2012"]["KPiPi"] = {"Type":"ExponentialPlusDoubleCrystalBall",
-                                                                                       "mean"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]["mean"][0]],
-                                                                                       "sigma1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]["sigma1"][0]],
-                                                                                       "sigma2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]["sigma2"][0]],
-                                                                                       "alpha1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]["alpha1"][0]],
-                                                                                       "alpha2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]["alpha2"][0]],
-                                                                                       "n1"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]["n1"][0]],
-                                                                                       "n2"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]["n2"][0]],
-                                                                                       "frac"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]["frac"][0]],
-                                                                                       "cB"    : [-2.1421e-03], "fracD":[6.5957e-01]}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsK"]["2012"]["PiPiPi"] = {"Type":"ExponentialPlusDoubleCrystalBall",
-                                                                                        "mean"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]["mean"][0]],
-                                                                                        "sigma1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]["sigma1"][0]],
-                                                                                        "sigma2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]["sigma2"][0]],
-                                                                                        "alpha1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]["alpha1"][0]],
-                                                                                        "alpha2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]["alpha2"][0]],
-                                                                                        "n1"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]["n1"][0]],
-                                                                                        "n2"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]["n2"][0]],
-                                                                                        "frac"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]["frac"][0]],
-                                                                                        "cB"    : [-5.3817e-03], "fracD":[7.5167e-01]}
-    ############################################################
-    
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"] = {}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsK"]["2011"]["NonRes"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                                      "Type": "FromWorkspace", "Workspace" : "workspace", "Contributions":{"Kaon","Pion"},
-                                                                                      "Name": {"Up":   {"Pion":"PIDKShape_CombPi_up_2011", "Kaon":"PIDKShape_CombK_up_2011", "fracPIDK":[7.0243e-01]}, 
-                                                                                               "Down": {"Pion":"PIDKShape_CombPi_down_2011", "Kaon":"PIDKShape_CombK_down_2011", "fracPIDK":[7.0243e-01]}}}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsK"]["2011"]["PhiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                                      "Type": "FromWorkspace", "Workspace" : "workspace", "Contributions":{"Kaon","Pion"},
-                                                                                      "Name": {"Up":   {"Pion":"PIDKShape_CombPi_up_2011", "Kaon":"PIDKShape_CombK_up_2011", "fracPIDK":[6.6355e-01]},
-                                                                                               "Down": {"Pion":"PIDKShape_CombPi_down_2011", "Kaon":"PIDKShape_CombK_down_2011", "fracPIDK":[6.6355e-01]}}}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsK"]["2011"]["KstK"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                                    "Type": "FromWorkspace", "Workspace" : "workspace", "Contributions":{"Kaon","Pion"},
-                                                                                    "Name": {"Up":   {"Pion":"PIDKShape_CombPi_up_2011", "Kaon":"PIDKShape_CombK_up_2011", "fracPIDK":[6.4798e-01]},
-                                                                                             "Down": {"Pion":"PIDKShape_CombPi_down_2011", "Kaon":"PIDKShape_CombK_down_2011", "fracPIDK":[6.4798e-01]}}}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsK"]["2011"]["KPiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                                     "Type": "FromWorkspace", "Workspace" : "workspace", "Contributions":{"Kaon","Pion"},
-                                                                                     "Name": {"Up":   {"Pion":"PIDKShape_CombPi_up_2011", "Kaon":"PIDKShape_CombK_up_2011", "fracPIDK":[8.6494e-01]},
-                                                                                              "Down": {"Pion":"PIDKShape_CombPi_down_2011", "Kaon":"PIDKShape_CombK_down_2011", "fracPIDK":[8.6494e-01]}}}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsK"]["2011"]["PiPiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                                      "Type": "FromWorkspace", "Workspace" : "workspace", "Contributions":{"Kaon","Pion"},
-                                                                                      "Name": {"Up":   {"Pion":"PIDKShape_CombPi_up_2011", "Kaon":"PIDKShape_CombK_up_2011", "fracPIDK":[8.8353e-01]},
-                                                                                               "Down": {"Pion":"PIDKShape_CombPi_down_2011", "Kaon":"PIDKShape_CombK_down_2011", "fracPIDK":[8.8353e-01]}}}
-
-
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsK"]["2012"]["NonRes"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                                      "Type": "FromWorkspace", "Workspace" : "workspace", "Contributions":{"Kaon","Pion"},
-                                                                                      "Name":  {"Up":   {"Pion":"PIDKShape_CombPi_up_2012", "Kaon":"PIDKShape_CombK_up_2012", "fracPIDK":[0.5]},
-                                                                                                "Down": {"Pion":"PIDKShape_CombPi_down_2012", "Kaon":"PIDKShape_CombK_down_2012", "fracPIDK":[0.5]}}}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsK"]["2012"]["PhiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                                      "Type": "FromWorkspace", "Workspace" : "workspace", "Contributions":{"Kaon","Pion"},
-                                                                                      "Name": {"Up":   {"Pion":"PIDKShape_CombPi_up_2012", "Kaon":"PIDKShape_CombK_up_2012", "fracPIDK":[6.6355e-01]},
-                                                                                               "Down": {"Pion":"PIDKShape_CombPi_down_2012", "Kaon":"PIDKShape_CombK_down_2012", "fracPIDK":[6.6355e-01]}}}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsK"]["2012"]["KstK"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                                    "Type": "FromWorkspace", "Workspace" : "workspace", "Contributions":{"Kaon","Pion"},
-                                                                                    "Name": {"Up":   {"Pion":"PIDKShape_CombPi_up_2012", "Kaon":"PIDKShape_CombK_up_2012", "fracPIDK":[6.4798e-01]},
-                                                                                             "Down": {"Pion":"PIDKShape_CombPi_down_2012", "Kaon":"PIDKShape_CombK_down_2012", "fracPIDK":[6.4798e-01]}}}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsK"]["2012"]["KPiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                                     "Type": "FromWorkspace", "Workspace" : "workspace", "Contributions":{"Kaon","Pion"},
-                                                                                     "Name": {"Up":   {"Pion":"PIDKShape_CombPi_up_2012", "Kaon":"PIDKShape_CombK_up_2012", "fracPIDK":[8.6494e-01]},
-                                                                                              "Down": {"Pion":"PIDKShape_CombPi_down_2012", "Kaon":"PIDKShape_CombK_down_2012", "fracPIDK":[8.6494e-01]}}}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsK"]["2012"]["PiPiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                                      "Type": "FromWorkspace", "Workspace" : "workspace", "Contributions":{"Kaon","Pion"},
-                                                                                      "Name": {"Up":   {"Pion":"PIDKShape_CombPi_up_2012", "Kaon":"PIDKShape_CombK_up_2012", "fracPIDK":[8.8353e-01]},
-                                                                                               "Down": {"Pion":"PIDKShape_CombPi_down_2012", "Kaon":"PIDKShape_CombK_down_2012", "fracPIDK":[8.8353e-01]}}}
-
-
-    ############################################################                                                                                                                                      
-    #                      Bs2DsPi                                                                                                                                                              
-    ############################################################                                                                                                                                  
-
-    configdict["PDFList"]["BeautyMass"]["Bs2DsPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bs2DsPi"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bs2DsPi"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bs2DsPi"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgBs2DsPiPdf_m_both_2011"}
-    configdict["PDFList"]["BeautyMass"]["Bs2DsPi"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bs2DsPi"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgBs2DsPiPdf_m_both_2012"}
-
-    ############################################################ 
-    configdict["PDFList"]["CharmMass"]["Bs2DsPi"] = {}
-    configdict["PDFList"]["CharmMass"]["Bs2DsPi"]["Bs2DsK"] = {}
-    configdict["PDFList"]["CharmMass"]["Bs2DsPi"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["CharmMass"]["Bs2DsPi"]["Bs2DsK"]["2011"]["NonRes"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsPi"]["Bs2DsK"]["2011"]["PhiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsPi"]["Bs2DsK"]["2011"]["KstK"]    =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsPi"]["Bs2DsK"]["2011"]["KPiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsPi"]["Bs2DsK"]["2011"]["PiPiPi"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsPi"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["CharmMass"]["Bs2DsPi"]["Bs2DsK"]["2012"]["NonRes"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsPi"]["Bs2DsK"]["2012"]["PhiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsPi"]["Bs2DsK"]["2012"]["KstK"]    =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsPi"]["Bs2DsK"]["2012"]["KPiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsPi"]["Bs2DsK"]["2012"]["PiPiPi"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]
-
-    ############################################################                                   
-    
-    configdict["PDFList"]["BacPIDK"]["Bs2DsPi"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bs2DsPi"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bs2DsPi"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bs2DsPi"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                             "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                             "Name": {"Up":"PIDKShape_Bs2DsPi_up_2011", "Down":"PIDKShape_Bs2DsPi_down_2011"}}
-    configdict["PDFList"]["BacPIDK"]["Bs2DsPi"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bs2DsPi"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                            "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                            "Name": {"Up":"PIDKShape_Bs2DsPi_up_2012", "Down":"PIDKShape_Bs2DsPi_down_2012"}}
-
-   ############################################################                                                                                                                                      
-    #                      Bs2DsstPi                                                                                                                                                              
-    ############################################################                                                                                                                                  
-
-    configdict["PDFList"]["BeautyMass"]["Bs2DsstPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bs2DsstPi"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bs2DsstPi"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bs2DsstPi"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgBs2DsstPiPdf_m_both_2011"}
-    configdict["PDFList"]["BeautyMass"]["Bs2DsstPi"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bs2DsstPi"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgBs2DsstPiPdf_m_both_2012"}
-
-    ############################################################ 
-    configdict["PDFList"]["CharmMass"]["Bs2DsstPi"] = {}
-    configdict["PDFList"]["CharmMass"]["Bs2DsstPi"]["Bs2DsK"] = {}
-    configdict["PDFList"]["CharmMass"]["Bs2DsstPi"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["CharmMass"]["Bs2DsstPi"]["Bs2DsK"]["2011"]["NonRes"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsstPi"]["Bs2DsK"]["2011"]["PhiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsstPi"]["Bs2DsK"]["2011"]["KstK"]    =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsstPi"]["Bs2DsK"]["2011"]["KPiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsstPi"]["Bs2DsK"]["2011"]["PiPiPi"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsstPi"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["CharmMass"]["Bs2DsstPi"]["Bs2DsK"]["2012"]["NonRes"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsstPi"]["Bs2DsK"]["2012"]["PhiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsstPi"]["Bs2DsK"]["2012"]["KstK"]    =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsstPi"]["Bs2DsK"]["2012"]["KPiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsstPi"]["Bs2DsK"]["2012"]["PiPiPi"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]
-
-    ############################################################                                   
-    
-    configdict["PDFList"]["BacPIDK"]["Bs2DsstPi"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bs2DsstPi"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bs2DsstPi"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bs2DsstPi"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                             "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                             "Name": {"Up":"PIDKShape_Bs2DsstPi_up_2011", "Down":"PIDKShape_Bs2DsstPi_down_2011"}}
-    configdict["PDFList"]["BacPIDK"]["Bs2DsstPi"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bs2DsstPi"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                            "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                            "Name": {"Up":"PIDKShape_Bs2DsstPi_up_2012", "Down":"PIDKShape_Bs2DsstPi_down_2012"}}
-
-    
-    ############################################################                                                                                                                                      
-    #                      Bs2DsRho                                                                                                                                                              
-    ############################################################                                                                                                                                  
-
-    configdict["PDFList"]["BeautyMass"]["Bs2DsRho"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bs2DsRho"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bs2DsRho"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bs2DsRho"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgBs2DsRhoPdf_m_both_2011"}
-    configdict["PDFList"]["BeautyMass"]["Bs2DsRho"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bs2DsRho"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgBs2DsRhoPdf_m_both_2012"}
-
-    ############################################################ 
-    configdict["PDFList"]["CharmMass"]["Bs2DsRho"] = {}
-    configdict["PDFList"]["CharmMass"]["Bs2DsRho"]["Bs2DsK"] = {}
-    configdict["PDFList"]["CharmMass"]["Bs2DsRho"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["CharmMass"]["Bs2DsRho"]["Bs2DsK"]["2011"]["NonRes"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsRho"]["Bs2DsK"]["2011"]["PhiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsRho"]["Bs2DsK"]["2011"]["KstK"]    =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsRho"]["Bs2DsK"]["2011"]["KPiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsRho"]["Bs2DsK"]["2011"]["PiPiPi"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsRho"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["CharmMass"]["Bs2DsRho"]["Bs2DsK"]["2012"]["NonRes"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsRho"]["Bs2DsK"]["2012"]["PhiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsRho"]["Bs2DsK"]["2012"]["KstK"]    =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsRho"]["Bs2DsK"]["2012"]["KPiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsRho"]["Bs2DsK"]["2012"]["PiPiPi"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]
-
-    ############################################################                                   
-    
-    configdict["PDFList"]["BacPIDK"]["Bs2DsRho"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bs2DsRho"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bs2DsRho"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bs2DsRho"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                             "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                             "Name": {"Up":"PIDKShape_Bs2DsRho_up_2011", "Down":"PIDKShape_Bs2DsRho_down_2011"}}
-    configdict["PDFList"]["BacPIDK"]["Bs2DsRho"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bs2DsRho"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                            "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                            "Name": {"Up":"PIDKShape_Bs2DsRho_up_2012", "Down":"PIDKShape_Bs2DsRho_down_2012"}}
-
-    ############################################################   
-    #                      Bd2DPi          
-    ############################################################   
-    
-    configdict["PDFList"]["BeautyMass"]["Bd2DPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DPi"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DPi"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DPi"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgBd2DPiPdf_m_both_2011"}
-    configdict["PDFList"]["BeautyMass"]["Bd2DPi"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DPi"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgBd2DPiPdf_m_both_2012"}
-
-    ############################################################
-    configdict["PDFList"]["CharmMass"]["Bd2DPi"] = {}
-    configdict["PDFList"]["CharmMass"]["Bd2DPi"]["Bs2DsK"] = {}
-    configdict["PDFList"]["CharmMass"]["Bd2DPi"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["CharmMass"]["Bd2DPi"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgBd2DPiPdf_m_both_2011_Ds"}
-    configdict["PDFList"]["CharmMass"]["Bd2DPi"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["CharmMass"]["Bd2DPi"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgBd2DPiPdf_m_both_2012_Ds"}
-
-    
-    ############################################################
-    configdict["PDFList"]["BacPIDK"]["Bd2DPi"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bd2DPi"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bd2DPi"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bd2DPi"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": {"Up":"PIDKShape_Bd2DPi_up_2011", "Down":"PIDKShape_Bd2DPi_down_2011"}}
-    configdict["PDFList"]["BacPIDK"]["Bd2DPi"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bd2DPi"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                            "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                            "Name": {"Up":"PIDKShape_Bd2DPi_up_2012", "Down":"PIDKShape_Bd2DPi_down_2012"}}
-
-    ############################################################   
-    #                      Bd2DK          
-    ############################################################   
-    
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                             "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                             "Name": "PhysBkgBd2DKPdf_m_both_2011"}
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DK"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                             "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                             "Name": "PhysBkgBd2DKPdf_m_both_2012"}
-
-    ############################################################
-    configdict["PDFList"]["CharmMass"]["Bd2DK"] = {}
-    configdict["PDFList"]["CharmMass"]["Bd2DK"]["Bs2DsK"] = {}
-    configdict["PDFList"]["CharmMass"]["Bd2DK"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["CharmMass"]["Bd2DK"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgBd2DKPdf_m_both_2011_Ds"}
-    configdict["PDFList"]["CharmMass"]["Bd2DK"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["CharmMass"]["Bd2DK"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgBd2DKPdf_m_both_2012_Ds"}
-
-    
-    ############################################################
-    configdict["PDFList"]["BacPIDK"]["Bd2DK"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bd2DK"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bd2DK"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bd2DK"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": {"Up":"PIDKShape_Bd2DK_up_2011", "Down":"PIDKShape_Bd2DK_down_2011"}}
-    configdict["PDFList"]["BacPIDK"]["Bd2DK"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bd2DK"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                            "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                            "Name": {"Up":"PIDKShape_Bd2DK_up_2012", "Down":"PIDKShape_Bd2DK_down_2012"}}
-    
-    ############################################################   
-    #                      Lb2LcPi              
-    ############################################################         
-
-    configdict["PDFList"]["BeautyMass"]["Lb2LcPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Lb2LcPi"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Lb2LcPi"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Lb2LcPi"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgLb2LcPiPdf_m_both_2011"}
-    configdict["PDFList"]["BeautyMass"]["Lb2LcPi"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BeautyMass"]["Lb2LcPi"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                                "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                                "Name": "PhysBkgLb2LcPiPdf_m_both_2012"}
-
-    ############################################################                                                                                                                                       
-    configdict["PDFList"]["CharmMass"]["Lb2LcPi"] = {}
-    configdict["PDFList"]["CharmMass"]["Lb2LcPi"]["Bs2DsK"] = {}
-    configdict["PDFList"]["CharmMass"]["Lb2LcPi"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["CharmMass"]["Lb2LcPi"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgLb2LcPiPdf_m_both_2011_Ds"}
-    configdict["PDFList"]["CharmMass"]["Lb2LcPi"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["CharmMass"]["Lb2LcPi"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgLb2LcPiPdf_m_both_2012_Ds"}
-
-
-    ############################################################                                                                                                                                       
-    configdict["PDFList"]["BacPIDK"]["Lb2LcPi"] = {}
-    configdict["PDFList"]["BacPIDK"]["Lb2LcPi"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BacPIDK"]["Lb2LcPi"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BacPIDK"]["Lb2LcPi"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                             "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                             "Name": {"Up":"PIDKShape_Lb2LcPi_up_2011", "Down":"PIDKShape_Lb2LcPi_down_2011"}}
-    configdict["PDFList"]["BacPIDK"]["Lb2LcPi"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BacPIDK"]["Lb2LcPi"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                             "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                             "Name": {"Up":"PIDKShape_Lb2LcPi_up_2012", "Down":"PIDKShape_Lb2LcPi_down_2012"}}
-
-    ############################################################   
-    #                      Lb2LcK             
-    ############################################################         
-
-    configdict["PDFList"]["BeautyMass"]["Lb2LcK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Lb2LcK"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Lb2LcK"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Lb2LcK"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgLb2LcPiPdf_m_both_2011"}
-    configdict["PDFList"]["BeautyMass"]["Lb2LcK"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BeautyMass"]["Lb2LcK"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                                "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                                "Name": "PhysBkgLb2LcPiPdf_m_both_2012"}
-
-    ############################################################                                                                                                                                       
-    configdict["PDFList"]["CharmMass"]["Lb2LcK"] = {}
-    configdict["PDFList"]["CharmMass"]["Lb2LcK"]["Bs2DsK"] = {}
-    configdict["PDFList"]["CharmMass"]["Lb2LcK"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["CharmMass"]["Lb2LcK"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgLb2LcPiPdf_m_both_2011_Ds"}
-    configdict["PDFList"]["CharmMass"]["Lb2LcK"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["CharmMass"]["Lb2LcK"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgLb2LcPiPdf_m_both_2012_Ds"}
-
-
-    ############################################################                                                                                                                                       
-    configdict["PDFList"]["BacPIDK"]["Lb2LcK"] = {}
-    configdict["PDFList"]["BacPIDK"]["Lb2LcK"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BacPIDK"]["Lb2LcK"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BacPIDK"]["Lb2LcK"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                             "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                             "Name": {"Up":"PIDKShape_Lb2LcPi_up_2011", "Down":"PIDKShape_Lb2LcPi_down_2011"}}
-    configdict["PDFList"]["BacPIDK"]["Lb2LcK"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BacPIDK"]["Lb2LcK"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                             "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                             "Name": {"Up":"PIDKShape_Lb2LcPi_up_2012", "Down":"PIDKShape_Lb2LcPi_down_2012"}}
-
-
-    ############################################################   
-    #                      Lb2Dsp             
-    ############################################################         
-
-    configdict["PDFList"]["BeautyMass"]["Lb2Dsp"] = {}
-    configdict["PDFList"]["BeautyMass"]["Lb2Dsp"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Lb2Dsp"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Lb2Dsp"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgLb2DspPdf_m_both_2011"}
-    configdict["PDFList"]["BeautyMass"]["Lb2Dsp"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BeautyMass"]["Lb2Dsp"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                                "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                                "Name": "PhysBkgLb2DspPdf_m_both_2012"}
-
-    ############################################################ 
-    configdict["PDFList"]["CharmMass"]["Lb2Dsp"] = {}
-    configdict["PDFList"]["CharmMass"]["Lb2Dsp"]["Bs2DsK"] = {}
-    configdict["PDFList"]["CharmMass"]["Lb2Dsp"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["CharmMass"]["Lb2Dsp"]["Bs2DsK"]["2011"]["NonRes"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]
-    configdict["PDFList"]["CharmMass"]["Lb2Dsp"]["Bs2DsK"]["2011"]["PhiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]
-    configdict["PDFList"]["CharmMass"]["Lb2Dsp"]["Bs2DsK"]["2011"]["KstK"]    =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]
-    configdict["PDFList"]["CharmMass"]["Lb2Dsp"]["Bs2DsK"]["2011"]["KPiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]
-    configdict["PDFList"]["CharmMass"]["Lb2Dsp"]["Bs2DsK"]["2011"]["PiPiPi"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]
-    configdict["PDFList"]["CharmMass"]["Lb2Dsp"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["CharmMass"]["Lb2Dsp"]["Bs2DsK"]["2012"]["NonRes"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]
-    configdict["PDFList"]["CharmMass"]["Lb2Dsp"]["Bs2DsK"]["2012"]["PhiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]
-    configdict["PDFList"]["CharmMass"]["Lb2Dsp"]["Bs2DsK"]["2012"]["KstK"]    =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]
-    configdict["PDFList"]["CharmMass"]["Lb2Dsp"]["Bs2DsK"]["2012"]["KPiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]
-    configdict["PDFList"]["CharmMass"]["Lb2Dsp"]["Bs2DsK"]["2012"]["PiPiPi"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]				    
-
-    ############################################################                                                                                                                                       
-    configdict["PDFList"]["BacPIDK"]["Lb2Dsp"] = {}
-    configdict["PDFList"]["BacPIDK"]["Lb2Dsp"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BacPIDK"]["Lb2Dsp"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BacPIDK"]["Lb2Dsp"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                             "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                             "Name": {"Up":"PIDKShape_Lb2Dsp_up_2011", "Down":"PIDKShape_Lb2Dsp_down_2011"}}
-    configdict["PDFList"]["BacPIDK"]["Lb2Dsp"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BacPIDK"]["Lb2Dsp"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                             "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                             "Name": {"Up":"PIDKShape_Lb2Dsp_up_2012", "Down":"PIDKShape_Lb2Dsp_down_2012"}}
-
-    ############################################################   
-    #                      Lb2Dsstp             
-    ############################################################         
-
-    configdict["PDFList"]["BeautyMass"]["Lb2Dsstp"] = {}
-    configdict["PDFList"]["BeautyMass"]["Lb2Dsstp"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Lb2Dsstp"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Lb2Dsstp"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgLb2DspPdf_m_both_2011"}
-    configdict["PDFList"]["BeautyMass"]["Lb2Dsstp"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BeautyMass"]["Lb2Dsstp"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                                "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                                "Name": "PhysBkgLb2DspPdf_m_both_2012"}
-
-    ############################################################ 
-    configdict["PDFList"]["CharmMass"]["Lb2Dsstp"] = {}
-    configdict["PDFList"]["CharmMass"]["Lb2Dsstp"]["Bs2DsK"] = {}
-    configdict["PDFList"]["CharmMass"]["Lb2Dsstp"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["CharmMass"]["Lb2Dsstp"]["Bs2DsK"]["2011"]["NonRes"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]
-    configdict["PDFList"]["CharmMass"]["Lb2Dsstp"]["Bs2DsK"]["2011"]["PhiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]
-    configdict["PDFList"]["CharmMass"]["Lb2Dsstp"]["Bs2DsK"]["2011"]["KstK"]    =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]
-    configdict["PDFList"]["CharmMass"]["Lb2Dsstp"]["Bs2DsK"]["2011"]["KPiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]
-    configdict["PDFList"]["CharmMass"]["Lb2Dsstp"]["Bs2DsK"]["2011"]["PiPiPi"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]
-    configdict["PDFList"]["CharmMass"]["Lb2Dsstp"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["CharmMass"]["Lb2Dsstp"]["Bs2DsK"]["2012"]["NonRes"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]
-    configdict["PDFList"]["CharmMass"]["Lb2Dsstp"]["Bs2DsK"]["2012"]["PhiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]
-    configdict["PDFList"]["CharmMass"]["Lb2Dsstp"]["Bs2DsK"]["2012"]["KstK"]    =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]
-    configdict["PDFList"]["CharmMass"]["Lb2Dsstp"]["Bs2DsK"]["2012"]["KPiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]
-    configdict["PDFList"]["CharmMass"]["Lb2Dsstp"]["Bs2DsK"]["2012"]["PiPiPi"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]				    
-
-    ############################################################                                                                                                                                       
-    configdict["PDFList"]["BacPIDK"]["Lb2Dsstp"] = {}
-    configdict["PDFList"]["BacPIDK"]["Lb2Dsstp"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BacPIDK"]["Lb2Dsstp"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BacPIDK"]["Lb2Dsstp"]["Bs2DsK"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                             "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                             "Name": {"Up":"PIDKShape_Lb2Dsstp_up_2011", "Down":"PIDKShape_Lb2Dsstp_down_2011"}}
-    configdict["PDFList"]["BacPIDK"]["Lb2Dsstp"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BacPIDK"]["Lb2Dsstp"]["Bs2DsK"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dsk_2nd_mcpid_signalpid_comb.root",
-                                                                             "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                             "Name": {"Up":"PIDKShape_Lb2Dsstp_up_2012", "Down":"PIDKShape_Lb2Dsstp_down_2012"}}
-
-    ############################################################                                                                                                                                          
-    #                      Bd2DsK                                 
-    ############################################################
-    
-    scale1_Bd2DPi = 1.00808721452
-    scale2_Bd2DPi = 1.03868673310
-    configdict["PDFList"]["BeautyMass"]["Bd2DsK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DsK"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DsK"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DsK"]["Bs2DsK"]["2011"]["NonRes"] = {"Type" : "DoubleCrystalBall",
-                                                                                   "mean" :  [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]["mean"][0] - 86.8], 
-                                                                                   "sigma1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]["sigma1"][0]*scale1_Bd2DPi], 
-                                                                                   "sigma2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]["sigma1"][0]*scale2_Bd2DPi], 
-                                                                                   "alpha1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]["alpha1"][0]],
-                                                                                   "alpha2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]["alpha2"][0]], 
-                                                                                   "n1"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]["n1"][0]], 
-                                                                                   "n2"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]["n2"][0]], 
-                                                                                   "frac"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]["frac"][0]]}
-
-    configdict["PDFList"]["BeautyMass"]["Bd2DsK"]["Bs2DsK"]["2011"]["PhiPi"] = {"Type" : "DoubleCrystalBall",
-                                                                                  "mean"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]["mean"][0] - 86.8],
-                                                                                  "sigma1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]["sigma1"][0]*scale1_Bd2DPi],
-                                                                                  "sigma2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]["sigma1"][0]*scale2_Bd2DPi],
-                                                                                  "alpha1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]["alpha1"][0]],
-                                                                                  "alpha2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]["alpha2"][0]],
-                                                                                  "n1"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]["n1"][0]],
-                                                                                  "n2"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]["n2"][0]],
-                                                                                  "frac"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]["frac"][0]]}
-
-    configdict["PDFList"]["BeautyMass"]["Bd2DsK"]["Bs2DsK"]["2011"]["KstK"] = {"Type" : "DoubleCrystalBall",
-                                                                                 "mean"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]["mean"][0] - 86.8],
-                                                                                 "sigma1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]["sigma1"][0]*scale1_Bd2DPi],
-                                                                                 "sigma2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]["sigma1"][0]*scale2_Bd2DPi],
-                                                                                 "alpha1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]["alpha1"][0]],
-                                                                                 "alpha2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]["alpha2"][0]],
-                                                                                 "n1"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]["n1"][0]],
-                                                                                 "n2"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]["n2"][0]],
-                                                                                 "frac"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]["frac"][0]]}
-
-    configdict["PDFList"]["BeautyMass"]["Bd2DsK"]["Bs2DsK"]["2011"]["KPiPi"] = {"Type" : "DoubleCrystalBall",
-                                                                                  "mean"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]["mean"][0] - 86.8],
-                                                                                  "sigma1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]["sigma1"][0]*scale1_Bd2DPi],
-                                                                                  "sigma2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]["sigma1"][0]*scale2_Bd2DPi],
-                                                                                  "alpha1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]["alpha1"][0]],
-                                                                                  "alpha2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]["alpha2"][0]],
-                                                                                  "n1"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]["n1"][0]],
-                                                                                  "n2"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]["n2"][0]],
-                                                                                  "frac"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]["frac"][0]]}
-
-    configdict["PDFList"]["BeautyMass"]["Bd2DsK"]["Bs2DsK"]["2011"]["PiPiPi"] = {"Type" : "DoubleCrystalBall",
-                                                                                   "mean"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]["mean"][0] - 86.8],
-                                                                                   "sigma1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]["sigma1"][0]*scale1_Bd2DPi],
-                                                                                   "sigma2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]["sigma1"][0]*scale2_Bd2DPi],
-                                                                                   "alpha1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]["alpha1"][0]],
-                                                                                   "alpha2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]["alpha2"][0]],
-                                                                                   "n1"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]["n1"][0]],
-                                                                                   "n2"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]["n2"][0]],
-                                                                                   "frac"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]["frac"][0]]}
-
-    configdict["PDFList"]["BeautyMass"]["Bd2DsK"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DsK"]["Bs2DsK"]["2012"]["NonRes"] = {"Type" : "DoubleCrystalBall",
-                                                                                   "mean"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]["mean"][0] - 86.8],
-                                                                                   "sigma1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]["sigma1"][0]*scale1_Bd2DPi],
-                                                                                   "sigma2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]["sigma1"][0]*scale2_Bd2DPi],
-                                                                                   "alpha1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]["alpha1"][0]],
-                                                                                   "alpha2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]["alpha2"][0]],
-                                                                                   "n1"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]["n1"][0]],
-                                                                                   "n2"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]["n2"][0]],
-                                                                                   "frac"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]["frac"][0]]}
-
-    configdict["PDFList"]["BeautyMass"]["Bd2DsK"]["Bs2DsK"]["2012"]["PhiPi"] = {"Type" : "DoubleCrystalBall",
-                                                                                  "mean"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]["mean"][0] - 86.8],
-                                                                                  "sigma1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]["sigma1"][0]*scale1_Bd2DPi],
-                                                                                  "sigma2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]["sigma1"][0]*scale2_Bd2DPi],
-                                                                                  "alpha1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]["alpha1"][0]],
-                                                                                  "alpha2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]["alpha2"][0]],
-                                                                                  "n1"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]["n1"][0]],
-                                                                                  "n2"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]["n2"][0]],
-                                                                                  "frac"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]["frac"][0]]}
-
-    configdict["PDFList"]["BeautyMass"]["Bd2DsK"]["Bs2DsK"]["2012"]["KstK"] = {"Type" : "DoubleCrystalBall",
-                                                                                 "mean"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]["mean"][0] - 86.8],
-                                                                                 "sigma1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]["sigma1"][0]*scale1_Bd2DPi],
-                                                                                 "sigma2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]["sigma1"][0]*scale2_Bd2DPi],
-                                                                                 "alpha1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]["alpha1"][0]],
-                                                                                 "alpha2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]["alpha2"][0]],
-                                                                                 "n1"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]["n1"][0]],
-                                                                                 "n2"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]["n2"][0]],
-                                                                                 "frac"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]["frac"][0]]}
-
-    configdict["PDFList"]["BeautyMass"]["Bd2DsK"]["Bs2DsK"]["2012"]["KPiPi"] = {"Type" : "DoubleCrystalBall",
-                                                                                  "mean"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]["mean"][0] - 86.8],
-                                                                                  "sigma1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]["sigma1"][0]*scale1_Bd2DPi],
-                                                                                  "sigma2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]["sigma1"][0]*scale2_Bd2DPi],
-                                                                                  "alpha1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]["alpha1"][0]],
-                                                                                  "alpha2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]["alpha2"][0]],
-                                                                                  "n1"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]["n1"][0]],
-                                                                                  "n2"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]["n2"][0]],
-                                                                                  "frac"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]["frac"][0]]}
-    
-    configdict["PDFList"]["BeautyMass"]["Bd2DsK"]["Bs2DsK"]["2012"]["PiPiPi"] = {"Type" : "DoubleCrystalBall",
-                                                                                   "mean"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]["mean"][0] - 86.8],
-                                                                                   "sigma1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]["sigma1"][0]*scale1_Bd2DPi],
-                                                                                   "sigma2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]["sigma1"][0]*scale2_Bd2DPi],
-                                                                                   "alpha1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]["alpha1"][0]],
-                                                                                   "alpha2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]["alpha2"][0]],
-                                                                                   "n1"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]["n1"][0]],
-                                                                                   "n2"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]["n2"][0]],
-                                                                                   "frac"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]["frac"][0]]}
-
-
-
-    #############################################################
-
-    configdict["PDFList"]["CharmMass"]["Bd2DsK"] = {}
-    configdict["PDFList"]["CharmMass"]["Bd2DsK"]["Bs2DsK"] = {}
-    configdict["PDFList"]["CharmMass"]["Bd2DsK"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["CharmMass"]["Bd2DsK"]["Bs2DsK"]["2011"]["NonRes"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]
-    configdict["PDFList"]["CharmMass"]["Bd2DsK"]["Bs2DsK"]["2011"]["PhiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]
-    configdict["PDFList"]["CharmMass"]["Bd2DsK"]["Bs2DsK"]["2011"]["KstK"]    =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KstK"]
-    configdict["PDFList"]["CharmMass"]["Bd2DsK"]["Bs2DsK"]["2011"]["KPiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]
-    configdict["PDFList"]["CharmMass"]["Bd2DsK"]["Bs2DsK"]["2011"]["PiPiPi"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]
-    configdict["PDFList"]["CharmMass"]["Bd2DsK"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["CharmMass"]["Bd2DsK"]["Bs2DsK"]["2012"]["NonRes"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]
-    configdict["PDFList"]["CharmMass"]["Bd2DsK"]["Bs2DsK"]["2012"]["PhiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]
-    configdict["PDFList"]["CharmMass"]["Bd2DsK"]["Bs2DsK"]["2012"]["KstK"]    =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KstK"]
-    configdict["PDFList"]["CharmMass"]["Bd2DsK"]["Bs2DsK"]["2012"]["KPiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]
-    configdict["PDFList"]["CharmMass"]["Bd2DsK"]["Bs2DsK"]["2012"]["PiPiPi"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]
-
-    #############################################################
-
-    configdict["PDFList"]["BacPIDK"]["Bd2DsK"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bd2DsK"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bd2DsK"]["Bs2DsK"]["2011"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bd2DsK"]["Bs2DsK"]["2011"]["NonRes"]  =  configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2011"]["NonRes"]
-    configdict["PDFList"]["BacPIDK"]["Bd2DsK"]["Bs2DsK"]["2011"]["PhiPi"]   =  configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2011"]["PhiPi"]
-    configdict["PDFList"]["BacPIDK"]["Bd2DsK"]["Bs2DsK"]["2011"]["KstK"]    =  configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2011"]["KstK"]
-    configdict["PDFList"]["BacPIDK"]["Bd2DsK"]["Bs2DsK"]["2011"]["KPiPi"]   =  configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2011"]["KPiPi"]
-    configdict["PDFList"]["BacPIDK"]["Bd2DsK"]["Bs2DsK"]["2011"]["PiPiPi"]  =  configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2011"]["PiPiPi"]
-    configdict["PDFList"]["BacPIDK"]["Bd2DsK"]["Bs2DsK"]["2012"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bd2DsK"]["Bs2DsK"]["2012"]["NonRes"]  =  configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2012"]["NonRes"]
-    configdict["PDFList"]["BacPIDK"]["Bd2DsK"]["Bs2DsK"]["2012"]["PhiPi"]   =  configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2012"]["PhiPi"]
-    configdict["PDFList"]["BacPIDK"]["Bd2DsK"]["Bs2DsK"]["2012"]["KstK"]    =  configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2012"]["KstK"]
-    configdict["PDFList"]["BacPIDK"]["Bd2DsK"]["Bs2DsK"]["2012"]["KPiPi"]   =  configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2012"]["KPiPi"]
-    configdict["PDFList"]["BacPIDK"]["Bd2DsK"]["Bs2DsK"]["2012"]["PiPiPi"]  =  configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsK"]["2012"]["PiPiPi"]
-
-
-
-
-    ############################################################ 
-    #Tagging calibration and mistag PDF. If "MistagPDF" : None,
-    #then a average mistag is used
-    ############################################################
-    
-    configdict["Taggers"] = {}
-    for comp in configdict["Components"].keys():
-        configdict["Taggers"][comp] = {}
-        configdict["Taggers"][comp] = {"OS" :
-                                       {"Calibration":
-                                        {"p0"       : [0.0],
-                                         "p1"       : [1.0],
-                                         "deltap0"  : [0.0],
-                                         "deltap1"  : [0.0],
-                                         "avgeta"   : [0.35],
-                                         "tageff"   : [0.6],
-                                         "tagasymm" : [0.0]
-                                         },
-                                        "MistagPDF" :
-                                        {"Type"     : "Mock",
-                                         "eta0"     : [0.0],
-                                         "etaavg"   : [0.35],
-                                         "f"        : [0.25]
-                                         }
-                                        },
-                                       "SS":
-                                       {"Calibration":
-                                        {"p0"       : [0.0],
-                                         "p1"       : [1.0],
-                                         "deltap0"  : [0.0],
-                                         "deltap1"  : [0.0],
-                                         "avgeta"   : [0.35],
-                                         "tageff"   : [0.6],
-                                         "tagasymm" : [0.0]
-                                         },
-                                        "MistagPDF" :
-                                        {"Type"     : "Mock",
-                                         "eta0"     : [0.0],
-                                         "etaavg"   : [0.35],
-                                         "f"        : [0.25]
-                                         }
-                                        }
-                                       }
-
-    ############################################################ 
-    #Time resolution and acceptance (there is a single dict because
-    #they are strongly connected in the way they are built).
-    #If "TimeErrorPDF" : None, then an average resolution model
-    #is used.
-    ############################################################
-    
-    configdict["ResolutionAcceptance"] = {}
-    for comp in configdict["Components"].keys():
-        configdict["ResolutionAcceptance"][comp] = {}
-        configdict["ResolutionAcceptance"][comp] = {"TimeErrorPDF": #None,
-                                                    {"Type": "Mock",
-                                                     "ResolutionAverage" : [0.5]
-                                                     },
-                                                    "Acceptance":
-                                                    {"Type": "Spline",
-                                                     "KnotPositions" : [ 0.5, 1.0, 1.5, 2.0, 3.0, 12.0 ],
-                                                     "KnotCoefficients" : [ 4.5853e-01, 6.8963e-01, 8.8528e-01,
-                                                                            1.1296e+00, 1.2232e+00, 1.2277e+00 ]},
-                                                    #"Resolution":
-                                                    #{"Type": "AverageModel",
-                                                    # "Parameters": { 'sigmas': [ 0.050 ], 'fractions': [] },
-                                                    # "Bias": [0.0],
-                                                    # "ScaleFactor": [1.0]}
-                                                    "Resolution":
-                                                    {"Type": "GaussianWithPEDTE",
-                                                     "Average": [0.5],
-                                                     "Bias": [0.0],
-                                                     "ScaleFactor": [1.0]}
-                                                    }
-        
-    ############################################################ 
-    #Production and detection asymmetries
-    ############################################################
-    
-    configdict["ProductionAsymmetry"] = {}
-    configdict["DetectionAsymmetry"] = {}
-    for comp in configdict["Components"].keys():
-        configdict["ProductionAsymmetry"][comp] = {}
-        configdict["DetectionAsymmetry"][comp] = {}
-        configdict["ProductionAsymmetry"][comp] = [0.1]
-        configdict["DetectionAsymmetry"][comp] = [0.1]
-
-    ############################################################ 
-    #Time PDF parameters
-    ############################################################
-    
-    configdict["ACP"] = {}
-
-    #Parameters from https://svnweb.cern.ch/trac/lhcb/browser/DBASE/tags/Gen/DecFiles/v27r42/dkfiles/Bd_D-pi+,Kpipi=CPVDDalitz,DecProdCut.dec)
-    ModqOverp_d     =  1
-    ArgqOverp_d     =  -0.746
-    ModpOverq_d     =  1
-    ArgpOverq_d     =  0.746
-    ModAf_d         =  0.0849
-    ArgAf_d         =  0.002278
-    ModAbarf_d      =  0.00137
-    ArgAbarf_d      =  -1.128958
-    ModAfbar_d      =  0.00137
-    ArgAfbar_d      =  1.3145
-    ModAbarfbar_d   =  0.0849
-    ArgAbarfbar_d   =  0.002278
-
-    #Signal (use more convenient interface with ArgLf_d, ArgLbarfbar_d and ModLf_d)
-    configdict["ACP"]["Signal"] = { "Gamma"                : [0.656],
-                                    "DeltaGamma"           : [0.00267],
-                                    "DeltaM"               : [0.510],
-                                    "ArgLf"                : [ArgqOverp_d + ArgAbarf_d - ArgAf_d],
-                                    "ArgLbarfbar"          : [ArgpOverq_d + ArgAfbar_d - ArgAbarfbar_d],
-                                    "ModLf"                : [old_div(ModAbarf_d,ModAf_d)],
-                                    "ParameteriseIntegral" : True,
-                                    "NBinsAcceptance"      : 0, #keep at zero if using spline acceptance!
-                                    "NBinsProperTimeErr"   : 100}
-
-    for comp in configdict["Components"].keys():
-        if comp != "Signal":
-            #Use other interface with C, S, Sbar, D, Dbar
-            #We build trivial PDFs since we don't care about background shapes in time if we use sWeights
-            configdict["ACP"][comp] = { "Gamma"                 : [1.0],
-                                        "DeltaGamma"            : [0.0],
-                                        "DeltaM"                : [0.0],
-                                        "C"                     : [0.0],
-                                        "S"                     : [0.0],
-                                        "Sbar"                  : [0.0],
-                                        "D"                     : [0.0],
-                                        "Dbar"                  : [0.0],
-                                        "ParameteriseIntegral"  : True,
-                                        "NBinsAcceptance"       : 0, #keep at zero if using spline acceptance!
-                                        "NBinsProperTimeErr"    : 100}
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/SignalConfigForFit.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/SignalConfigForFit.py
deleted file mode 100644
index 6d05ff0e47852f481d6025848982916a0a19bf08..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/SignalConfigForFit.py
+++ /dev/null
@@ -1,103 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bs2DsK"
-    configdict["CharmModes"] = {"NonRes","PhiPi","KstK","KPiPi","PiPiPi"} 
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2011"} 
-    # stripping (necessary in case of PIDK shapes)
-    configdict["Stripping"] = {"2011":"21r1","2012":"21"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes) 
-    configdict["IntegratedLuminosity"] = {"2011": {"Down": 0.59, "Up": 0.44}, "2012":{"Down": 0.9894, "Up": 0.9985}}
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/Bs2DsK/config_Bs2DsK.txt"
-    #settings for control plots 
-    configdict["ControlPlots"] = {} 
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsK", "Extension":"pdf"} 
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5100,    5600    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [1.61,    5.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [-0.0,     1.0    ], "InputName" : "BDTGResponse_2"}
-
-    # additional cuts applied to data sets
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0",            "MC" : "lab2_TAU>0&&lab1_M>200", "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9&&lab45_MM<1700", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                     
-    # order of particles: KKPi, KPiPi, PiPiPi                                
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-    #weighting templates by PID eff/misID
-    configdict["WeightingMassTemplates"]= { "Variables":["lab4_P","lab5_P"], "PIDBach": 5, "PIDChild": 0, "PIDProton": 5, "RatioDataMC":True }
-    
-    #weighting for PID templates
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[20,20] }
-
-    
-    # Bs signal shapes                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBall"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"All":1.0717e+01}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"All":1.6005e+01}, "Fixed":False}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"All":2.2118e+00}, "Fixed":False}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"All":-2.4185e+00}, "Fixed":False}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"All":1.0019e+00}, "Fixed":False}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"All":3.1469e+00}, "Fixed":False}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"All":6.1755e-01}, "Fixed":False}
-
-    #Ds signal shapes                                                                                                
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBall"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"KKPi":5.3468e+00,  "KPiPi":8.8531e+00,  "PiPiPi":8.0860e+00}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"KKPi":5.1848e+00,  "KPiPi":5.2073e+00,  "PiPiPi":7.3773e+00}, "Fixed":False}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"KKPi":1.2252e+00,  "KPiPi":1.7131e+00,  "PiPiPi":9.0639e-01}, "Fixed":False}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"KKPi":-1.1167e+00, "KPiPi":-2.5276e+00, "PiPiPi":-1.1122e+00}, "Fixed":False}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"KKPi":4.6625e+00,  "KPiPi":2.0239e+00,  "PiPiPi":1.1486e+01}, "Fixed":False}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"KKPi":6.9989e+01,  "KPiPi":1.0860e+00,  "PiPiPi":4.0001e+01}, "Fixed":False}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"KKPi":4.7565e-01,  "KPiPi":5.5084e-01,  "PiPiPi":4.8729e-01}, "Fixed":False}
-
-    #expected yields                                                                                                                                                              
-    configdict["Yields"] = {}
-    configdict["Yields"]["Signal"]  = {"2011": {"NonRes":50000.0,  "PhiPi":50000.0, "KstK":50000.0, "KPiPi":50000.0, "PiPiPi":50000.0},
-                                       "2012": {"NonRes":50000.0,  "PhiPi":50000.0, "KstK":50000.0, "KPiPi":50000.0, "PiPiPi":50000.0}, "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#            
-    ###                                                               MDfit plotting settings                                                                                 
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------# 
- 
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = { "EPDF": ["Sig"],
-                                                 "PDF":  ["Sig"],
-                                                 "Legend": ["Sig"]}
-    configdict["PlotSettings"]["colors"] = { "PDF": [kBlue+2],
-                                             "Legend": [kBlue+2]}
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66], 
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/config_Bs2DsK.txt b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/config_Bs2DsK.txt
deleted file mode 100644
index b4eda7e773466d774208350e22f8598ab8ed210f..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/config_Bs2DsK.txt
+++ /dev/null
@@ -1,518 +0,0 @@
-#Bs2DsK NonRes 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_DsK_nonres_2011_Dw.root
-Bs_DsK_nonres_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK PhiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_DsK_phipi_2011_Dw.root
-Bs_DsK_phipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK KstK 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_DsK_KstK_2011_Dw.root
-Bs_DsK_KstK_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_DsK_Kpipi_2011_Dw.root
-Bs_DsK_Kpipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK PiPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_DsK_pipipi_2011_Dw.root
-Bs_DsK_pipipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK NonRes 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_DsK_nonres_2012_Dw.root
-Bs_DsK_nonres_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK PhiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_DsK_phipi_2012_Dw.root
-Bs_DsK_phipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK KstK 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_DsK_KstK_2012_Dw.root
-Bs_DsK_KstK_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_DsK_Kpipi_2012_Dw.root
-Bs_DsK_Kpipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK PiPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_DsK_pipipi_2012_Dw.root
-Bs_DsK_pipipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi NonRes 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_nonres_2011_Dw.root
-Bs_Dspi_nonres_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PhiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_phipi_2011_Dw.root
-Bs_Dspi_phipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KstK 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_KstK_2011_Dw.root
-Bs_Dspi_KstK_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_Kpipi_2011_Dw.root
-Bs_Dspi_Kpipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PiPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_pipipi_2011_Dw.root
-Bs_Dspi_pipipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi NonRes 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_nonres_2012_Dw.root
-Bs_Dspi_nonres_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PhiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_phipi_2012_Dw.root
-Bs_Dspi_phipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KstK 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_KstK_2012_Dw.root
-Bs_Dspi_KstK_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_Kpipi_2012_Dw.root
-Bs_Dspi_Kpipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PiPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_pipipi_2012_Dw.root
-Bs_Dspi_pipipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-
-#sWeights
-/afs/cern.ch/work/a/adudziak/public/sWeights/
-sWeights_BsDsK_all_both.root
-sWeights_BsDsK_all_both.root
-merged
-merged
-###
-
-#PIDK Pion 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21r1_2011_MagDown_nTracks_P.root
-Pi_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Pion 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21_2012_MagDown_nTracks_P.root
-Pi_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21r1_2011_MagDown_nTracks_P.root
-K_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21_2012_MagDown_nTracks_P.root
-K_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Proton 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21r1_2011_MagDown_nTracks_P.root
-P_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Proton 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21_2012_MagDown_nTracks_P.root
-P_Strip21_2012_MagUp_nTracks_P.root
-###
-
-
-#PIDp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_TightCuts.root
-EffHistos_Reco12_39Mom_Proton_MagUp_TightCuts.root
-###
-
-#PID
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PID2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_45678.root
-EffHistos_Reco12_39Mom_MagUp_3456.root
-###
-
-#RatioDataMC2D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-MomVsnTr_Comp_DPi_Down_hist.root
-MomVsnTr_Comp_DPi_Up_hist.root
-###
-
-#RatioDataMC 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/
-MomVsnTr_Comp_DPi_2011_dw_hist.root
-MomVsnTr_Comp_DPi_2011_up_hist.root
-###
-
-#RatioDataMC 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/
-MomVsnTr_Comp_DPi_2012_dw_hist.root
-MomVsnTr_Comp_DPi_2012_up_hist.root
-###
-
-#RatioDataMC 2011 PNTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PNTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-#RatioDataMC 2011 PTnTr
-/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/dataMCWeights/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PTnTr
-/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/dataMCWeights/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-
-#MC FileName KKPi MD 2011
-{"Mode":"Bd2DK",     
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bd_D-K+_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_Dspi_KKpi_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"} 
-{"Mode":"Bs2DsRho",  
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_Dsrho_KKpi_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi", 
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_Dsstpi_KKpi_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",    
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Lb_Dsp_K+K-pi-_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",  
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Lb_Dsstp_K+K-pi-_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",    
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Lb_LambdacK_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",   
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Lb_Lambdacpi_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",    
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MU 2011
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bd_D-K+_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_Dspi_KKpi_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_Dsrho_KKpi_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_Dsstpi_KKpi_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Lb_Dsp_K+K-pi-_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Lb_Dsstp_K+K-pi-_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Lb_LambdacK_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Lb_Lambdacpi_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL//B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MD 2012
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bd_D-K+_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_Dspi_KKpi_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_Dsrho_KKpi_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_Dsstpi_KKpi_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Lb_Dsp_K+K-pi-_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Lb_Dsstp_K+K-pi-_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Lb_LambdacK_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Lb_Lambdacpi_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MU 2012
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bd_D-K+_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_Dspi_KKpi_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_Dsrho_KKpi_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_Dsstpi_KKpi_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Lb_Dsp_K+K-pi-_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Lb_Dsstp_K+K-pi-_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Lb_LambdacK_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Lb_Lambdacpi_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL//B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-
-#Kfactor MC FileName MD
-{"Mode":"Bd2DK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DK_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsRho_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsstp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcK_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-
-#Signal Bs2DsK KstK 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_DsK_KKpi_CPV_Dn_OFFLINE_Bs_DsK_KstK.root
-B2DX_MC_Bs_DsK_KKpi_CPV_Up_OFFLINE_Bs_DsK_KstK.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsK PhiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_DsK_KKpi_CPV_Dn_OFFLINE_Bs_DsK_phipi.root
-B2DX_MC_Bs_DsK_KKpi_CPV_Up_OFFLINE_Bs_DsK_phipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsK NonRes 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_DsK_KKpi_CPV_Dn_OFFLINE_Bs_DsK_nonres.root
-B2DX_MC_Bs_DsK_KKpi_CPV_Up_OFFLINE_Bs_DsK_nonres.root
-DecayTree
-DecayTree
-###
-
-
-#Signal Bs2DsK KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_DsK_Kpipi_CPV_Dn_OFFLINE_Bs_DsK_Kpipi.root
-B2DX_MC_Bs_DsK_Kpipi_CPV_Up_OFFLINE_Bs_DsK_Kpipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsK PiPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_DsK_pipipi_CPV_Dn_OFFLINE_Bs_DsK_pipipi.root
-B2DX_MC_Bs_DsK_pipipi_CPV_Up_OFFLINE_Bs_DsK_pipipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsK KstK 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_DsK_KKpi_CPV_Dn_OFFLINE_Bs_DsK_KstK.root
-B2DX_MC_Bs_DsK_KKpi_CPV_Up_OFFLINE_Bs_DsK_KstK.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsK PhiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_DsK_KKpi_CPV_Dn_OFFLINE_Bs_DsK_phipi.root
-B2DX_MC_Bs_DsK_KKpi_CPV_Up_OFFLINE_Bs_DsK_phipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsK NonRes 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_DsK_KKpi_CPV_Dn_OFFLINE_Bs_DsK_nonres.root
-B2DX_MC_Bs_DsK_KKpi_CPV_Up_OFFLINE_Bs_DsK_nonres.root
-DecayTree
-DecayTree
-###
-
-
-#Signal Bs2DsK KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_DsK_Kpipi_CPV_Dn_OFFLINE_Bs_DsK_Kpipi.root
-B2DX_MC_Bs_DsK_Kpipi_CPV_Up_OFFLINE_Bs_DsK_Kpipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsK PiPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_DsK_pipipi_CPV_Dn_OFFLINE_Bs_DsK_pipipi.root
-B2DX_MC_Bs_DsK_pipipi_CPV_Up_OFFLINE_Bs_DsK_pipipi.root
-DecayTree
-DecayTree
-###
-
-
-
-#PID2m2
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_0123.root
-EffHistos_Reco12_39Mom_MagUp_2m2_012.root
-###
-
-#PID2m22
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_45678.root
-EffHistos_Reco12_39Mom_MagUp_2m2_3456.root
-###
-
-#PIDp3
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_Proton_DLLKDLLpK.root
-EffHistos_Reco12_39Mom_MagUp_Proton_DLLKDLLpK.root
-###
-
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/config_Bs2DsK_newBDTG.txt b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/config_Bs2DsK_newBDTG.txt
deleted file mode 100644
index 1a307d0bdd26bad7c4cdd537cbdd6de9f5b93b85..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/config_Bs2DsK_newBDTG.txt
+++ /dev/null
@@ -1,531 +0,0 @@
-#Bs2DsK NonRes 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_DsK_nonres_2011_Dw.root
-Bs_DsK_nonres_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK PhiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_DsK_phipi_2011_Dw.root
-Bs_DsK_phipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK KstK 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_DsK_KstK_2011_Dw.root
-Bs_DsK_KstK_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_DsK_Kpipi_2011_Dw.root
-Bs_DsK_Kpipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK PiPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_DsK_pipipi_2011_Dw.root
-Bs_DsK_pipipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK NonRes 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_DsK_nonres_2012_Dw.root
-Bs_DsK_nonres_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK PhiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_DsK_phipi_2012_Dw.root
-Bs_DsK_phipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK KstK 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_DsK_KstK_2012_Dw.root
-Bs_DsK_KstK_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_DsK_Kpipi_2012_Dw.root
-Bs_DsK_Kpipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK PiPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_DsK_pipipi_2012_Dw.root
-Bs_DsK_pipipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi NonRes 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_nonres_2011_Dw.root
-Bs_Dspi_nonres_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PhiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_phipi_2011_Dw.root
-Bs_Dspi_phipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KstK 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_KstK_2011_Dw.root
-Bs_Dspi_KstK_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_Kpipi_2011_Dw.root
-Bs_Dspi_Kpipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PiPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_pipipi_2011_Dw.root
-Bs_Dspi_pipipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi NonRes 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_nonres_2012_Dw.root
-Bs_Dspi_nonres_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PhiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_phipi_2012_Dw.root
-Bs_Dspi_phipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KstK 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_KstK_2012_Dw.root
-Bs_Dspi_KstK_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_Kpipi_2012_Dw.root
-Bs_Dspi_Kpipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PiPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_pipipi_2012_Dw.root
-Bs_Dspi_pipipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-
-#sWeights
-/afs/cern.ch/work/a/adudziak/public/sWeights/
-sWeights_BsDsK_all_both.root
-sWeights_BsDsK_all_both.root
-merged
-merged
-###
-
-#PIDK Pion 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21r1_2011_MagDown_nTracks_P.root
-Pi_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Pion 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21_2012_MagDown_nTracks_P.root
-Pi_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21r1_2011_MagDown_nTracks_P.root
-K_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21_2012_MagDown_nTracks_P.root
-K_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Proton 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21r1_2011_MagDown_nTracks_P.root
-P_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Proton 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21_2012_MagDown_nTracks_P.root
-P_Strip21_2012_MagUp_nTracks_P.root
-###
-
-
-#PIDp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_TightCuts.root
-EffHistos_Reco12_39Mom_Proton_MagUp_TightCuts.root
-###
-
-#PID
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PID2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_45678.root
-EffHistos_Reco12_39Mom_MagUp_3456.root
-###
-
-#RatioDataMC2D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-MomVsnTr_Comp_DPi_Down_hist.root
-MomVsnTr_Comp_DPi_Up_hist.root
-###
-
-#RatioDataMC 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/
-MomVsnTr_Comp_DPi_2011_dw_hist.root
-MomVsnTr_Comp_DPi_2011_up_hist.root
-###
-
-#RatioDataMC 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/
-MomVsnTr_Comp_DPi_2012_dw_hist.root
-MomVsnTr_Comp_DPi_2012_up_hist.root
-###
-
-#RatioDataMC 2011 PNTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PNTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-#RatioDataMC 2011 PTnTr Filtered
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/pT_nTracks/filtered/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PTnTr Filtered
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/pT_nTracks/filtered/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-#RatioDataMC 2011 PTnTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/pT_nTracks/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PTnTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/pT_nTracks/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-
-#MC FileName KKPi MD 2011
-{"Mode":"Bd2DK",     
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-K+_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dspi_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"} 
-{"Mode":"Bs2DsRho",  
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsrho_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi", 
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstpi_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",    
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Dsp_K+K-pi-_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",  
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Dsstp_K+K-pi-_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",    
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_LambdacK_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",   
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",    
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MU 2011
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-K+_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dspi_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsrho_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstpi_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Dsp_K+K-pi-_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Dsstp_K+K-pi-_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_LambdacK_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MD 2012
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-K+_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dspi_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsrho_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstpi_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Dsp_K+K-pi-_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Dsstp_K+K-pi-_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_LambdacK_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MU 2012
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-K+_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dspi_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsrho_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstpi_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Dsp_K+K-pi-_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Dsstp_K+K-pi-_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_LambdacK_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-
-#Kfactor MC FileName MD
-{"Mode":"Bd2DK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DK_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsRho_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsstp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcK_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-#Signal Bs2DsK KstK 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_DsK_KKpi_Dn_OFFLINE_Bs_DsK_KstK.root
-B2DX_MC_Bs_DsK_KKpi_Up_OFFLINE_Bs_DsK_KstK.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsK PhiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_DsK_KKpi_Dn_OFFLINE_Bs_DsK_phipi.root
-B2DX_MC_Bs_DsK_KKpi_Up_OFFLINE_Bs_DsK_phipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsK NonRes 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_DsK_KKpi_Dn_OFFLINE_Bs_DsK_nonres.root
-B2DX_MC_Bs_DsK_KKpi_Up_OFFLINE_Bs_DsK_nonres.root
-DecayTree
-DecayTree
-###
-
-
-#Signal Bs2DsK KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_DsK_Kpipi_Dn_OFFLINE_Bs_DsK_Kpipi.root
-B2DX_MC_Bs_DsK_Kpipi_Up_OFFLINE_Bs_DsK_Kpipi.root
-DecayTree
-DecayTree
-###
-
-
-#Signal Bs2DsK PiPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_DsK_pipipi_Dn_OFFLINE_Bs_DsK_pipipi.root
-B2DX_MC_Bs_DsK_pipipi_Up_OFFLINE_Bs_DsK_pipipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsK KstK 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_DsK_KKpi_Dn_OFFLINE_Bs_DsK_KstK.root
-B2DX_MC_Bs_DsK_KKpi_Up_OFFLINE_Bs_DsK_KstK.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsK PhiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_DsK_KKpi_Dn_OFFLINE_Bs_DsK_phipi.root
-B2DX_MC_Bs_DsK_KKpi_Up_OFFLINE_Bs_DsK_phipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsK NonRes 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_DsK_KKpi_Dn_OFFLINE_Bs_DsK_nonres.root
-B2DX_MC_Bs_DsK_KKpi_Up_OFFLINE_Bs_DsK_nonres.root
-DecayTree
-DecayTree
-###
-
-
-#Signal Bs2DsK KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_DsK_Kpipi_Dn_OFFLINE_Bs_DsK_Kpipi.root
-B2DX_MC_Bs_DsK_Kpipi_Up_OFFLINE_Bs_DsK_Kpipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsK PiPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_DsK_pipipi_Dn_OFFLINE_Bs_DsK_pipipi.root
-B2DX_MC_Bs_DsK_pipipi_Up_OFFLINE_Bs_DsK_pipipi.root
-DecayTree
-DecayTree
-###
-
-
-
-
-#PID2m2
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_0123.root
-EffHistos_Reco12_39Mom_MagUp_2m2_012.root
-###
-
-#PID2m22
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_45678.root
-EffHistos_Reco12_39Mom_MagUp_2m2_3456.root
-###
-
-#PIDp3
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_Proton_DLLKDLLpK.root
-EffHistos_Reco12_39Mom_MagUp_Proton_DLLKDLLpK.root
-###
-
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/config_Bs2DsK_newBDTG_filtered.txt b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/config_Bs2DsK_newBDTG_filtered.txt
deleted file mode 100644
index 5371df726bc4cea7ff9955538757c577d9c2b708..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsK/config_Bs2DsK_newBDTG_filtered.txt
+++ /dev/null
@@ -1,530 +0,0 @@
-#Bs2DsK NonRes 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_DsK_nonres_2011_Dw.root
-Bs_DsK_nonres_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK PhiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_DsK_phipi_2011_Dw.root
-Bs_DsK_phipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK KstK 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_DsK_KstK_2011_Dw.root
-Bs_DsK_KstK_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_DsK_Kpipi_2011_Dw.root
-Bs_DsK_Kpipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK PiPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_DsK_pipipi_2011_Dw.root
-Bs_DsK_pipipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK NonRes 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_DsK_nonres_2012_Dw.root
-Bs_DsK_nonres_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK PhiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_DsK_phipi_2012_Dw.root
-Bs_DsK_phipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK KstK 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_DsK_KstK_2012_Dw.root
-Bs_DsK_KstK_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_DsK_Kpipi_2012_Dw.root
-Bs_DsK_Kpipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK PiPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_DsK_pipipi_2012_Dw.root
-Bs_DsK_pipipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi NonRes 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_nonres_2011_Dw.root
-Bs_Dspi_nonres_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PhiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_phipi_2011_Dw.root
-Bs_Dspi_phipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KstK 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_KstK_2011_Dw.root
-Bs_Dspi_KstK_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_Kpipi_2011_Dw.root
-Bs_Dspi_Kpipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PiPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_pipipi_2011_Dw.root
-Bs_Dspi_pipipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi NonRes 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_nonres_2012_Dw.root
-Bs_Dspi_nonres_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PhiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_phipi_2012_Dw.root
-Bs_Dspi_phipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KstK 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_KstK_2012_Dw.root
-Bs_Dspi_KstK_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_Kpipi_2012_Dw.root
-Bs_Dspi_Kpipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PiPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_pipipi_2012_Dw.root
-Bs_Dspi_pipipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-
-#sWeights
-/afs/cern.ch/work/a/adudziak/public/sWeights/
-sWeights_BsDsK_all_both.root
-sWeights_BsDsK_all_both.root
-merged
-merged
-###
-
-#PIDK Pion 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21r1_2011_MagDown_nTracks_P.root
-Pi_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Pion 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21_2012_MagDown_nTracks_P.root
-Pi_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21r1_2011_MagDown_nTracks_P.root
-K_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21_2012_MagDown_nTracks_P.root
-K_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Proton 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21r1_2011_MagDown_nTracks_P.root
-P_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Proton 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21_2012_MagDown_nTracks_P.root
-P_Strip21_2012_MagUp_nTracks_P.root
-###
-
-
-#PIDp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_TightCuts.root
-EffHistos_Reco12_39Mom_Proton_MagUp_TightCuts.root
-###
-
-#PID
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PID2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_45678.root
-EffHistos_Reco12_39Mom_MagUp_3456.root
-###
-
-#RatioDataMC2D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-MomVsnTr_Comp_DPi_Down_hist.root
-MomVsnTr_Comp_DPi_Up_hist.root
-###
-
-#RatioDataMC 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/
-MomVsnTr_Comp_DPi_2011_dw_hist.root
-MomVsnTr_Comp_DPi_2011_up_hist.root
-###
-
-#RatioDataMC 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/
-MomVsnTr_Comp_DPi_2012_dw_hist.root
-MomVsnTr_Comp_DPi_2012_up_hist.root
-###
-
-#RatioDataMC 2011 PNTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PNTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-#RatioDataMC 2011 PTnTr Filtered
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/pT_nTracks/filtered/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PTnTr Filtered
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/pT_nTracks/filtered/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-#RatioDataMC 2011 PTnTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/pT_nTracks/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PTnTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/pT_nTracks/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-
-#MC FileName KKPi MD 2011
-{"Mode":"Bd2DK",     
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-K+_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dspi_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"} 
-{"Mode":"Bs2DsRho",  
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsrho_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi", 
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstpi_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",    
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Dsp_K+K-pi-_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",  
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Dsstp_K+K-pi-_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",    
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_LambdacK_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",   
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",    
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MU 2011
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-K+_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dspi_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsrho_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstpi_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Dsp_K+K-pi-_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Dsstp_K+K-pi-_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_LambdacK_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MD 2012
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-K+_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dspi_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsrho_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstpi_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Dsp_K+K-pi-_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Dsstp_K+K-pi-_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_LambdacK_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MU 2012
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-K+_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dspi_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsrho_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstpi_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Dsp_K+K-pi-_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Dsstp_K+K-pi-_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_LambdacK_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-
-#Kfactor MC FileName MD
-{"Mode":"Bd2DK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DK_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsRho_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsstp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcK_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-
-#Signal Bs2DsK KstK 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC_Filtered/FINAL/
-B2DX_MC_Bs_DsK_KKpi_CPV_2011_Dn_OFFLINE_Bs_DsK_KstK.root
-B2DX_MC_Bs_DsK_KKpi_CPV_2011_Up_OFFLINE_Bs_DsK_KstK.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsK PhiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC_Filtered/FINAL/
-B2DX_MC_Bs_DsK_KKpi_CPV_2011_Dn_OFFLINE_Bs_DsK_phipi.root
-B2DX_MC_Bs_DsK_KKpi_CPV_2011_Up_OFFLINE_Bs_DsK_phipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsK NonRes 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC_Filtered/FINAL/
-B2DX_MC_Bs_DsK_KKpi_CPV_2011_Dn_OFFLINE_Bs_DsK_nonres.root
-B2DX_MC_Bs_DsK_KKpi_CPV_2011_Up_OFFLINE_Bs_DsK_nonres.root
-DecayTree
-DecayTree
-###
-
-
-#Signal Bs2DsK KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC_Filtered/FINAL/
-B2DX_MC_Bs_DsK_Kpipi_CPV_2011_Dn_OFFLINE_Bs_DsK_Kpipi.root
-B2DX_MC_Bs_DsK_Kpipi_CPV_2011_Up_OFFLINE_Bs_DsK_Kpipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsK PiPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC_Filtered/FINAL/
-B2DX_MC_Bs_DsK_pipipi_CPV_2011_Dn_OFFLINE_Bs_DsK_pipipi.root
-B2DX_MC_Bs_DsK_pipipi_CPV_2011_Up_OFFLINE_Bs_DsK_pipipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsK KstK 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC_Filtered/FINAL/
-B2DX_MC_Bs_DsK_KKpi_CPV_2012_Dn_OFFLINE_Bs_DsK_KstK.root
-B2DX_MC_Bs_DsK_KKpi_CPV_2012_Up_OFFLINE_Bs_DsK_KstK.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsK PhiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC_Filtered/FINAL/
-B2DX_MC_Bs_DsK_KKpi_CPV_2012_Dn_OFFLINE_Bs_DsK_phipi.root
-B2DX_MC_Bs_DsK_KKpi_CPV_2012_Up_OFFLINE_Bs_DsK_phipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsK NonRes 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC_Filtered/FINAL/
-B2DX_MC_Bs_DsK_KKpi_CPV_2012_Dn_OFFLINE_Bs_DsK_nonres.root
-B2DX_MC_Bs_DsK_KKpi_CPV_2012_Up_OFFLINE_Bs_DsK_nonres.root
-DecayTree
-DecayTree
-###
-
-
-#Signal Bs2DsK KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC_Filtered/FINAL/
-B2DX_MC_Bs_DsK_Kpipi_CPV_2012_Dn_OFFLINE_Bs_DsK_Kpipi.root
-B2DX_MC_Bs_DsK_Kpipi_CPV_2012_Up_OFFLINE_Bs_DsK_Kpipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsK PiPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC_Filtered/FINAL/
-B2DX_MC_Bs_DsK_pipipi_CPV_2012_Dn_OFFLINE_Bs_DsK_pipipi.root
-B2DX_MC_Bs_DsK_pipipi_CPV_2012_Up_OFFLINE_Bs_DsK_pipipi.root
-DecayTree
-DecayTree
-###
-
-
-
-#PID2m2
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_0123.root
-EffHistos_Reco12_39Mom_MagUp_2m2_012.root
-###
-
-#PID2m22
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_45678.root
-EffHistos_Reco12_39Mom_MagUp_2m2_3456.root
-###
-
-#PIDp3
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_Proton_DLLKDLLpK.root
-EffHistos_Reco12_39Mom_MagUp_Proton_DLLKDLLpK.root
-###
-
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForMCSplineFit.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForMCSplineFit.py
deleted file mode 100644
index 23d625fec7b54745f433cbc8118f4c5de79ef145..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForMCSplineFit.py
+++ /dev/null
@@ -1,39 +0,0 @@
-def getconfig() :
-
-    from Bs2DsPiConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Tau_H"] = 1.660999991
-    configdict["Tau_L"] = 1.404999988
-    configdict["Gamma_H"] = 1.0/configdict["Tau_H"]
-    configdict["Gamma_L"] = 1.0/configdict["Tau_L"]
-    configdict["Gammas"]  = (configdict["Gamma_H"] + configdict["Gamma_L"])/2.0
-    configdict["Tau"] =1.52231245
-    configdict["DeltaGammas"] = configdict["Gamma_H"] -configdict["Gamma_L"]
-
-
-    configdict["DeltaMs"]       = 0.0   # in ps^{-1}                                                                                                                                           
-    configdict["cos"] = 0.0
-    configdict["sin"] = 0.0
-    configdict["sinh"] = 0.0
-
-    configdict["Bins"] = 1000
-
-
-    configdict["Acceptance"] = { "knots":  [0.50,       1.0,        1.5,        2.0,        3.0,      12.0],
-                                 "values": [4.5579e-01, 7.0310e-01, 8.7709e-01, 1.1351e+00, 1.0e+00,  1.0, 1.0e+00] }
-#    configdict["Acceptance"] = { "knots":  [0.50,     0.75,  1.0,        1.5,        2.0,        3.0,      12.0],
-#                                 "values": [4.5579e-01, 5.5e-01, 7.0310e-01, 8.7709e-01, 1.1351e+00, 1.0e+00,  1.0, 1.0e+00] }
-#    configdict["Acceptance"] = { "knots":  [0.50,       1.0,        1.5,        2.0,        3.0,      6.0,  12.0],
-#                                 "values": [4.5579e-01, 7.0310e-01, 8.7709e-01, 1.1351e+00, 1.0e+00,  1.0e+00,  1.0, 1.0e+00] }
-#    configdict["Acceptance"] = { "knots":  [0.50,       0.75, 1.0,        1.5,        2.0,        3.0,      6.0,  12.0],
-#                                 "values": [4.5579e-01, 5.5e-01, 7.0310e-01, 8.7709e-01, 1.1351e+00, 1.0e+00,  1.0e+00,  1.0, 1.0e+00] }
-
-    configdict["Resolution"] = {"scaleFactor":1.201}
-
-    configdict["constParams"] = []
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalDMSFitSplinesFloatAcc.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalDMSFitSplinesFloatAcc.py
deleted file mode 100644
index 00eeebd796caccd0eabc3203ecfafbebf19066c8..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalDMSFitSplinesFloatAcc.py
+++ /dev/null
@@ -1,178 +0,0 @@
-def getconfig() :
-
-    from Bs2DsPiConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]        =  0.6643 #0.0020   # in ps^{-1}
-    configdict["DeltaGammas"]   =  -0.083 #-0.006
-    configdict["DeltaMs"]       = 17.757   # in ps^{-1}
-    configdict["TagEffSig"]     = 0.403
-    configdict["TagOmegaSig"]   = 0.391
-    configdict["StrongPhase"]   = 20. / 180. * pi
-    configdict["WeakPhase"]     = 70./180.*pi
-    configdict["ModLf"]         = 0.372
-    configdict["CPlimit"]       = {"upper":4.0, "lower":-4.0} 
-
-
-    configdict["Asymmetries"] = {"Detection":1.0/100.0,
-                                 "Production":1.1/100.0}
-#    configdict["Asymmetries"] = {"Detection":0.0,
-#                                 "Production":0.0}
-
-
-    configdict["TaggingCalibration"] = {}
-
-    configdict["FixAcceptance"] = False
-    configdict["ConstrainsForTaggingCalib"] = True
-
-    configdict["UsedResolution"] = "Nominal"
-
-    if configdict["UsedResolution"] == "Nominal":
-    # Nominal Resolution and corresponding tagging parameters
-        configdict["Resolution"] = { "scaleFactor":{"p0":0.010262, "p1":1.280, "p2":0.0},
-                                     "meanBias":0.0,
-                                     "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                                "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                     "templates": { "fileName":"work_templates_dspi.root",
-                                                    "workName":"work",
-                                                    "templateName":"TimeErrorPdf_Bs2DsPi"} }
-#        configdict["TaggingCalibration"]["SS"] = {"p0": 0.44590, "dp0": 0.0, "p1": 0.9617, "dp1": 0.0,
-#                                                  "cov": [ [2.903e-05, 0.0, 0.0001613, 0.0],
-#                                                           [0.0, 1.0, 0.0, 0.0],
-#                                                           [0.0001613, 0.0, 0.006101, 0.0],
-#                                                           [0.0, 0.0, 0.0, 1.0]],
-#                                                  "average": 0.43744, "tagEff":0.636, "aTagEff":0.0, "use":True}
-#        configdict["TaggingCalibration"]["OS"] = {"p0": 0.3898, "dp0": 0.0, "p1": 0.9907, "dp1": 0.0,
-#                                                  "cov": [ [5.212e-05, 0.0, 0.0002286, 0.0],
-#                                                           [0.0, 1.0, 0.0, 0.0],
-#                                                           [0.0002286, 0.0, 0.006685, 0.0],
-#                                                           [0.0, 0.0, 0.0, 1.0]],
-#                                                  "average": 0.369798, "tagEff":0.374, "aTagEff":0.0, "use":True}
-        configdict["TaggingCalibration"]["SS"] = {"p0": 0.44119, "dp0": 0.0, "p1": 1.0868, "dp1": 0.0,
-                                                  "cov": [ [2.903e-05, 0.0, 0.0001613, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0001613, 0.0, 0.006101, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.43744, "tagEff":0.63926, "aTagEff":0.0, "use":True}
-        configdict["TaggingCalibration"]["OS"] = {"p0": 0.37718, "dp0": 0.0, "p1": 1.1244, "dp1": 0.0,
-                                                  "cov": [ [5.212e-05, 0.0, 0.0002286, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0002286, 0.0, 0.006685, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-#        configdict["TaggingCalibration"]["SS"] = {"p0": 0.43703, "dp0": 0.0, "p1": 1.1314, "dp1": 0.0,
-#                                                  "cov": [ [3.217e-05, 0.0, 0.0001613, 0.0],
-#                                                           [0.0, 1.0, 0.0, 0.0],
-#                                                           [0.0001613, 0.0, 0.006253, 0.0],
-#                                                           [0.0, 0.0, 0.0, 1.0]],
-#                                                  "average": 0.43744, "tagEff":0.63925, "aTagEff":0.0, "use":False}
-#        configdict["TaggingCalibration"]["OS"] = {"p0": 0.36820, "dp0": 0.0, "p1": 1.1993, "dp1": 0.0,
-#                                                  "cov": [ [5.878e-05, 0.0, 0.0002331, 0.0],
-#                                                           [0.0, 1.0, 0.0, 0.0],
-#                                                           [0.0002331, 0.0, 0.0074, 0.0],
-#                                                           [0.0, 0.0, 0.0, 1.0]],
-#                                                  "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":False}
-
-    if configdict["UsedResolution"] == "SingleGaussian":
-    # Single Gaussian Resolution and corresponding Tagging Parameter
-        configdict["Resolution"] = { "scaleFactor":{"p0":0.0, "p1":1.772, "p2":0.0},
-                                     "meanBias":0.0,
-                                     "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                                "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                     "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                    "workName":"workspace",
-                                                    "templateName":"TimeErrorPdf_Bs2DsPi"} }
-        configdict["TaggingCalibration"]["SS"] = {"p0": 0.43703, "dp0": 0.0, "p1": 1.1314, "dp1": 0.0,
-                                                  "cov": [ [3.217e-05, 0.0, 0.0001613, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0001613, 0.0, 0.006253, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.43744, "tagEff":0.63925, "aTagEff":0.0, "use":True}
-        configdict["TaggingCalibration"]["OS"] = {"p0": 0.36820, "dp0": 0.0, "p1": 1.1993, "dp1": 0.0,
-                                                  "cov": [ [5.878e-05, 0.0, 0.0002331, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0002331, 0.0, 0.0074, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-        
-    if configdict["UsedResolution"] == "SecondApproach":
-    # Resolution for second approach to check systematics and corresponding Tagging Parameter
-        configdict["Resolution"] = { "scaleFactor":{"p0":0.000568, "p1":1.243, "p2":0.0},
-                                     "meanBias":0.0,
-                                     "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                                "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                     "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                    "workName":"workspace",
-                                                    "templateName":"TimeErrorPdf_Bs2DsPi"} }
-        configdict["TaggingCalibration"]["SS"] = {"p0": 0.44907, "dp0": 0.0, "p1": 0.95005, "dp1": 0.0,
-                                                  "cov": [ [2.263e-05, 0.0, 0.0001461, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0001461, 0.0, 0.005204, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.43744, "tagEff":0.63926, "aTagEff":0.0, "use":True}
-        configdict["TaggingCalibration"]["OS"] = {"p0": 0.39432, "dp0": 0.0, "p1": 0.97298, "dp1": 0.0,
-                                                  "cov": [ [4.122e-05, 0.0, 0.0002132, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0002132, 0.0, 0.005549, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-
-    configdict["Acceptance"] = { "knots": [0.50, 1.0,  1.5, 2.0, 3.0, 12.0],
-                                 "values": [3.774e-01,5.793e-01,7.752e-01,1.0043e+00,1.0937e+00,1.1872e+00] }
-#    configdict["Acceptance"] = { "knots": [0.50, 1.0,  1.5, 2.0, 3.0, 12.0],
-#                                 "values": [0.4382, 0.6840, 0.8382, 1.1381, 1.2230, 1.3113] }
-#    configdict["Acceptance"] = { "knots": [0.50, 0.75, 1.0,  1.5, 2.0, 3.0, 12.0],
-#                                 "values": [0.4382, 0.500, 0.6840, 0.8382, 1.1381, 1.2230, 1.3113] }
-#    configdict["Acceptance"] = { "knots": [0.50, 1.0,  1.5, 2.0, 3.0, 6.0, 12.0],
-#                                 "values": [0.4382, 0.6840, 0.8382, 1.1381, 1.2230, 1.2500, 1.3113] }
-#    configdict["Acceptance"] = { "knots": [0.50, 0.75, 1.0,  1.5, 2.0, 3.0, 6.0, 12.0],
-#                                 "values": [0.4382, 0.500, 0.6840, 0.8382, 1.1381, 1.2230, 1.2500, 1.3113] }
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas_Bs2DsPi')
-    configdict["constParams"].append('deltaGammas_Bs2DsPi')
-    configdict["constParams"].append('C_Bs2DsPi')
-    configdict["constParams"].append('Cbar_Bs2DsPi')
-    configdict["constParams"].append('S_Bs2DsPi')
-    configdict["constParams"].append('Sbar_Bs2DsPi')
-    configdict["constParams"].append('D_Bs2DsPi')
-    configdict["constParams"].append('Dbar_Bs2DsPi')
-    configdict["constParams"].append('tagEff_OS')
-    configdict["constParams"].append('tagEff_SS')
-    configdict["constParams"].append('tagEff_Both')
-    configdict["constParams"].append('aTagEff_OS')
-    configdict["constParams"].append('aTagEff_SS')
-    configdict["constParams"].append('aTagEff_Both')
-    if configdict["FixAcceptance"] == True:
-        configdict["constParams"].append('var1')
-        configdict["constParams"].append('var2')
-        configdict["constParams"].append('var3')
-        configdict["constParams"].append('var4')
-        configdict["constParams"].append('var5')
-        configdict["constParams"].append('var6')
-        configdict["constParams"].append('var7')
-    if configdict["ConstrainsForTaggingCalib"] == False:
-        configdict["constParams"].append('p0_OS')
-        configdict["constParams"].append('p0_SS')
-        configdict["constParams"].append('p1_OS')
-        configdict["constParams"].append('p1_SS')
-    configdict["constParams"].append('dp0_OS')
-    configdict["constParams"].append('dp0_SS')
-    configdict["constParams"].append('dp1_OS')
-    configdict["constParams"].append('dp1_SS')
-    configdict["constParams"].append('p0_mean_OS')
-    configdict["constParams"].append('p0_mean_SS')
-    configdict["constParams"].append('p1_mean_OS')
-    configdict["constParams"].append('p1_mean_SS')
-    configdict["constParams"].append('dp0_mean_OS')
-    configdict["constParams"].append('dp0_mean_SS')
-    configdict["constParams"].append('dp1_mean_OS')
-    configdict["constParams"].append('dp1_mean_SS')
-    configdict["constParams"].append('average_OS')
-    configdict["constParams"].append('average_SS')
-#    configdict["constParams"].append('DeltaMs_Bs2DsPi')
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalDMSFitSplinesFloatAccMC.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalDMSFitSplinesFloatAccMC.py
deleted file mode 100644
index 2d92aa04ecbe1604153f78ab5b0c4d0be04bd942..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalDMSFitSplinesFloatAccMC.py
+++ /dev/null
@@ -1,103 +0,0 @@
-def getconfig() :
-
-    from Bs2DsPiConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]        =  0.6568953699   # in ps^{-1}
-    configdict["DeltaGammas"]   =  -0.1096968152
-    configdict["DeltaMs"]       = 17.799999999   # in ps^{-1}
-    configdict["TagEffSig"]     = 0.403
-    configdict["TagOmegaSig"]   = 0.391
-    configdict["StrongPhase"]   = 20. / 180. * pi
-    configdict["WeakPhase"]     = 70./180.*pi
-    configdict["ModLf"]         = 0.372
-    configdict["CPlimit"]       = {"upper":4.0, "lower":-4.0} 
-
-    configdict["TaggingCalibration"] = {}
-
-    configdict["ConstrainsForTaggingCalib"] = False
-    configdict["FixAcceptance"] = False
-
-    # Nominal MC Resolution and corresponding tagging parameters (Dspi)
-    configdict["Resolution"] = { "scaleFactor":{"p0":0.0, "p1":1.201, "p2":0.0},
-                                 "meanBias":0.0,
-                                 "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                            "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                 "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                "workName":"workspace",
-                                                "templateName":"TimeErrorPdf_Bs2DsPi"} }
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4267, "dp0": 0.0, "p1": 1.186, "dp1": 0.0,
-                                              "cov": [ [1.0, 0.0, 0.0, 0.0],
-                                                       [0.0, 1.0, 0.0, 0.0],
-                                                       [0.0, 0.0, 1.0, 0.0],
-                                                       [0.0, 0.0, 0.0, 1.0]],
-#                                              "average": 0.4314, "tagEff":0.63926, "aTagEff":0.0, "use":True}
-                                              "average": 0.4314, "tagEff":0.70123, "aTagEff":0.0, "use":True}
-
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3607, "dp0": 0.0, "p1": 0.936, "dp1": 0.0,
-                                              "cov": [ [1.0, 0.0, 0.0, 0.0],
-                                                       [0.0, 1.0, 0.0, 0.0],
-                                                       [0.0, 0.0, 1.0, 0.0],
-                                                       [0.0, 0.0, 0.0, 1.0]],
-#                                              "average": 0.3597, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-                                              "average": 0.3597, "tagEff":0.39425, "aTagEff":0.0, "use":True}
-
-
-    configdict["Acceptance"] = { "knots": [0.50, 1.0,  1.5, 2.0, 3.0, 12.0],
-                                 "values": [4.0349e-01, 5.8534e-01, 7.7696e-01, 9.1592e-01, 9.9973e-01, 1.0705e+00] }
-#                                 "values": [5.6512e-01, 6.3939e-01, 9.9391e-01, 1.0961e+00, 1.0567e+00, 1.2991e+00] }
-
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas_Bs2DsPi')
-    configdict["constParams"].append('deltaGammas_Bs2DsPi')
-#    configdict["constParams"].append('DeltaMs_Bs2DsPi')
-    configdict["constParams"].append('C_Bs2DsPi')
-    configdict["constParams"].append('Cbar_Bs2DsPi')
-    configdict["constParams"].append('S_Bs2DsPi')
-    configdict["constParams"].append('Sbar_Bs2DsPi')
-    configdict["constParams"].append('D_Bs2DsPi')
-    configdict["constParams"].append('Dbar_Bs2DsPi')
-    configdict["constParams"].append('tagEff_OS')
-    configdict["constParams"].append('tagEff_SS')
-    configdict["constParams"].append('aTagEff_OS')
-    configdict["constParams"].append('aTagEff_SS')
-    configdict["constParams"].append('aTagEff_Both')
-
-    if configdict["FixAcceptance"] == True:
-        configdict["constParams"].append('var1')
-        configdict["constParams"].append('var2')
-        configdict["constParams"].append('var3')
-        configdict["constParams"].append('var4')
-        configdict["constParams"].append('var5')
-        configdict["constParams"].append('var6')
-    if configdict["ConstrainsForTaggingCalib"] == False:
-        configdict["constParams"].append('p0_OS')
-        configdict["constParams"].append('p0_SS')
-        configdict["constParams"].append('p1_OS')
-        configdict["constParams"].append('p1_SS')
-
-    configdict["constParams"].append('dp0_OS')
-    configdict["constParams"].append('dp0_SS')
-    configdict["constParams"].append('dp1_OS')
-    configdict["constParams"].append('dp1_SS')
-    configdict["constParams"].append('p0_mean_OS')
-    configdict["constParams"].append('p0_mean_SS')
-    configdict["constParams"].append('p1_mean_OS')
-    configdict["constParams"].append('p1_mean_SS')
-    configdict["constParams"].append('dp0_mean_OS')
-    configdict["constParams"].append('dp0_mean_SS')
-    configdict["constParams"].append('dp1_mean_OS')
-    configdict["constParams"].append('dp1_mean_SS')
-    configdict["constParams"].append('average_OS')
-    configdict["constParams"].append('average_SS')
-
-
-
-
-    #configdict["constParams"].append('DeltaMs')
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalDMSFitTaggingOS.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalDMSFitTaggingOS.py
deleted file mode 100644
index a386c78b7b4c1d76990a6f2637a6a257e863a233..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalDMSFitTaggingOS.py
+++ /dev/null
@@ -1,158 +0,0 @@
-def getconfig() :
-
-    from Bs2DsPiConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]        =  0.6643   # in ps^{-1}
-    configdict["DeltaGammas"]   =  -0.083
-    configdict["DeltaMs"]       = 17.757   # in ps^{-1}
-    configdict["TagEffSig"]     = 0.403
-    configdict["TagOmegaSig"]   = 0.391
-    configdict["StrongPhase"]   = 20. / 180. * pi
-    configdict["WeakPhase"]     = 70./180.*pi
-    configdict["ModLf"]         = 0.372
-    configdict["CPlimit"]       = {"upper":4.0, "lower":-4.0} 
-
-
-    configdict["Asymmetries"] = {"Detection":1.0/100.0,
-                                 "Production":1.1/100.0}
-#    configdict["Asymmetries"] = {"Detection":0.0,
-#                                 "Production":0.0}
-
-    configdict["TaggingCalibration"] = {}
-
-    configdict["ConstrainsForTaggingCalib"] = False
-
-    configdict["UsedResolution"] = "Nominal"
-
-    if configdict["UsedResolution"] == "Nominal":
-    # Nominal Resolution and corresponding tagging parameters
-        configdict["Resolution"] = { "scaleFactor":{"p0":0.010262, "p1":1.280, "p2":0.0},
-                                     "meanBias":0.0,
-                                     "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                                "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                     "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                    "workName":"workspace",
-                                                    "templateName":"TimeErrorPdf_Bs2DsPi"} }
-        configdict["TaggingCalibration"]["SS"] = {"p0": 0.44119, "dp0": 0.0, "p1": 1.0868, "dp1": 0.0,
-                                                  "cov": [ [2.903e-05, 0.0, 0.0001613, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0001613, 0.0, 0.006101, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.43744, "tagEff":0.636, "aTagEff":0.0, "use":False}
-        configdict["TaggingCalibration"]["OS"] = {"p0": 0.37718, "dp0": 0.0, "p1": 1.1244, "dp1": 0.0,
-                                                  "cov": [ [5.212e-05, 0.0, 0.0002286, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0002286, 0.0, 0.006685, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.369798, "tagEff":0.374, "aTagEff":0.0, "use":True}
-#        configdict["TaggingCalibration"]["OS"] = {"p0": 0.37718, "dp0": 0.014, "p1": 1.1244, "dp1": 0.066,
-#                                                  "cov": [ [5.212e-05, 0.0, 0.0002286, 0.0],
-#                                                           [0.0, 1.44e-6, 0.0, 7.488e-6],
-#                                                           [0.0002286, 0.0, 0.006685, 0.0],
-#                                                           [0.0, 7.488e-6, 0.0, 1.44e-4]],
-#                                                  "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":False}
-#        configdict["TaggingCalibration"]["SS"] = {"p0": 0.44119, "dp0":-0.0163, "p1": 1.0868, "dp1": -0.031,
-#                                                  "cov": [ [2.903e-05, 0.0, 0.0001613, 0.0],
-#                                                           [0.0, 1.369e-05, 0.0, 1.03896e-4],
-#                                                           [0.0001613, 0.0, 0.006101, 0.0],
-#                                                           [0.0, 1.03896e-4, 0.0, 2.704e-3]],
-#                                                  "average": 0.43744, "tagEff":0.63926, "aTagEff":0.0, "use":True}
-
-
-    if configdict["UsedResolution"] == "SingleGaussian":
-    # Single Gaussian Resolution and corresponding Tagging Parameter
-        configdict["Resolution"] = { "scaleFactor":{"p0":0.0, "p1":1.772, "p2":0.0},
-                                     "meanBias":0.0,
-                                     "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                                "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                     "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                    "workName":"workspace",
-                                                    "templateName":"TimeErrorPdf_Bs2DsPi"} }
-        configdict["TaggingCalibration"]["SS"] = {"p0": 0.43703, "dp0": 0.0, "p1": 1.1314, "dp1": 0.0,
-                                                  "cov": [ [3.217e-05, 0.0, 0.0001613, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0001613, 0.0, 0.006253, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.43744, "tagEff":0.63925, "aTagEff":0.0, "use":True}
-        configdict["TaggingCalibration"]["OS"] = {"p0": 0.36820, "dp0": 0.0, "p1": 1.1993, "dp1": 0.0,
-                                                  "cov": [ [5.878e-05, 0.0, 0.0002331, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0002331, 0.0, 0.0074, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-        
-    if configdict["UsedResolution"] == "SecondApproach":
-    # Resolution for second approach to check systematics and corresponding Tagging Parameter
-        configdict["Resolution"] = { "scaleFactor":{"p0":0.000568, "p1":1.243, "p2":0.0},
-                                     "meanBias":0.0,
-                                     "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                                "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                     "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                    "workName":"workspace",
-                                                    "templateName":"TimeErrorPdf_Bs2DsPi"} }
-        configdict["TaggingCalibration"]["SS"] = {"p0": 0.44907, "dp0": 0.0, "p1": 0.95005, "dp1": 0.0,
-                                                  "cov": [ [2.263e-05, 0.0, 0.0001461, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0001461, 0.0, 0.005204, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.43744, "tagEff":0.63926, "aTagEff":0.0, "use":True}
-        configdict["TaggingCalibration"]["OS"] = {"p0": 0.39432, "dp0": 0.0, "p1": 0.97298, "dp1": 0.0,
-                                                  "cov": [ [4.122e-05, 0.0, 0.0002132, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0002132, 0.0, 0.005549, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-
-
-    configdict["Acceptance"] = { "knots": [0.50, 1.0,  1.5, 2.0, 3.0, 12.0],
-                                 "values": [3.774e-01,5.793e-01,7.752e-01,1.0043e+00,1.0937e+00,1.1872e+00] }
-
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas_Bs2DsPi')
-    configdict["constParams"].append('deltaGammas_Bs2DsPi')
-    configdict["constParams"].append('DeltaMs_Bs2DsPi')
-    configdict["constParams"].append('C_Bs2DsPi')
-    configdict["constParams"].append('Cbar_Bs2DsPi')
-    configdict["constParams"].append('S_Bs2DsPi')
-    configdict["constParams"].append('Sbar_Bs2DsPi')
-    configdict["constParams"].append('D_Bs2DsPi')
-    configdict["constParams"].append('Dbar_Bs2DsPi')
-#    configdict["constParams"].append('tagEff_OS')
-#    configdict["constParams"].append('tagEff_SS')
-    configdict["constParams"].append('aTagEff_OS')
-    configdict["constParams"].append('aTagEff_SS')
-#    configdict["constParams"].append('p0_OS')
-#    configdict["constParams"].append('p0_SS')
-#    configdict["constParams"].append('p1_OS')
-#    configdict["constParams"].append('p1_SS')
-    configdict["constParams"].append('dp0_OS')
-    configdict["constParams"].append('dp0_SS')
-    configdict["constParams"].append('dp1_OS')
-    configdict["constParams"].append('dp1_SS')
-    configdict["constParams"].append('p0_mean_OS')
-    configdict["constParams"].append('p0_mean_SS')
-    configdict["constParams"].append('p1_mean_OS')
-    configdict["constParams"].append('p1_mean_SS')
-    configdict["constParams"].append('dp0_mean_OS')
-    configdict["constParams"].append('dp0_mean_SS')
-    configdict["constParams"].append('dp1_mean_OS')
-    configdict["constParams"].append('dp1_mean_SS')
-    configdict["constParams"].append('average_OS')
-    configdict["constParams"].append('average_SS')
-    configdict["constParams"].append('var1')
-    configdict["constParams"].append('var2')
-    configdict["constParams"].append('var3')
-    configdict["constParams"].append('var4')
-    configdict["constParams"].append('var5')
-    configdict["constParams"].append('var6')
-
-
-
-    #configdict["constParams"].append('DeltaMs')
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalDMSFitTaggingSS.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalDMSFitTaggingSS.py
deleted file mode 100644
index 2aa8d28744776095d5d444142625e8f812afe0ac..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalDMSFitTaggingSS.py
+++ /dev/null
@@ -1,158 +0,0 @@
-def getconfig() :
-
-    from Bs2DsPiConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]        =  0.6643   # in ps^{-1}
-    configdict["DeltaGammas"]   =  -0.083
-    configdict["DeltaMs"]       = 17.757   # in ps^{-1}
-    configdict["TagEffSig"]     = 0.403
-    configdict["TagOmegaSig"]   = 0.391
-    configdict["StrongPhase"]   = 20. / 180. * pi
-    configdict["WeakPhase"]     = 70./180.*pi
-    configdict["ModLf"]         = 0.372
-    configdict["CPlimit"]       = {"upper":4.0, "lower":-4.0} 
-
-
-    configdict["Asymmetries"] = {"Detection":1.0/100.0,
-                                 "Production":1.1/100.0}
-#    configdict["Asymmetries"] = {"Detection":0.0,
-#                                 "Production":0.0}
-
-    configdict["TaggingCalibration"] = {}
-
-    configdict["ConstrainsForTaggingCalib"] = False
-
-    configdict["UsedResolution"] = "Nominal"
-
-    if configdict["UsedResolution"] == "Nominal":
-    # Nominal Resolution and corresponding tagging parameters
-        configdict["Resolution"] = { "scaleFactor":{"p0":0.010262, "p1":1.280, "p2":0.0},
-                                     "meanBias":0.0,
-                                     "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                                "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                     "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                    "workName":"workspace",
-                                                    "templateName":"TimeErrorPdf_Bs2DsPi"} }
-        configdict["TaggingCalibration"]["SS"] = {"p0": 0.44590, "dp0": 0.0, "p1": 0.9617, "dp1": 0.0,
-                                                  "cov": [ [2.903e-05, 0.0, 0.0001613, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0001613, 0.0, 0.006101, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.43744, "tagEff":0.636, "aTagEff":0.0, "use":True}
-        configdict["TaggingCalibration"]["OS"] = {"p0": 0.3898, "dp0": 0.0, "p1": 0.9907, "dp1": 0.0,
-                                                  "cov": [ [5.212e-05, 0.0, 0.0002286, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0002286, 0.0, 0.006685, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.369798, "tagEff":0.374, "aTagEff":0.0, "use":False}
-#        configdict["TaggingCalibration"]["OS"] = {"p0": 0.37718, "dp0": 0.014, "p1": 1.1244, "dp1": 0.066,
-#                                                  "cov": [ [5.212e-05, 0.0, 0.0002286, 0.0],
-#                                                           [0.0, 1.44e-6, 0.0, 7.488e-6],
-#                                                           [0.0002286, 0.0, 0.006685, 0.0],
-#                                                           [0.0, 7.488e-6, 0.0, 1.44e-4]],
-#                                                  "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":False}
-#        configdict["TaggingCalibration"]["SS"] = {"p0": 0.44119, "dp0":-0.0163, "p1": 1.0868, "dp1": -0.031,
-#                                                  "cov": [ [2.903e-05, 0.0, 0.0001613, 0.0],
-#                                                           [0.0, 1.369e-05, 0.0, 1.03896e-4],
-#                                                           [0.0001613, 0.0, 0.006101, 0.0],
-#                                                           [0.0, 1.03896e-4, 0.0, 2.704e-3]],
-#                                                  "average": 0.43744, "tagEff":0.63926, "aTagEff":0.0, "use":True}
-
-
-    if configdict["UsedResolution"] == "SingleGaussian":
-    # Single Gaussian Resolution and corresponding Tagging Parameter
-        configdict["Resolution"] = { "scaleFactor":{"p0":0.0, "p1":1.772, "p2":0.0},
-                                     "meanBias":0.0,
-                                     "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                                "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                     "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                    "workName":"workspace",
-                                                    "templateName":"TimeErrorPdf_Bs2DsPi"} }
-        configdict["TaggingCalibration"]["SS"] = {"p0": 0.43703, "dp0": 0.0, "p1": 1.1314, "dp1": 0.0,
-                                                  "cov": [ [3.217e-05, 0.0, 0.0001613, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0001613, 0.0, 0.006253, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.43744, "tagEff":0.63925, "aTagEff":0.0, "use":True}
-        configdict["TaggingCalibration"]["OS"] = {"p0": 0.36820, "dp0": 0.0, "p1": 1.1993, "dp1": 0.0,
-                                                  "cov": [ [5.878e-05, 0.0, 0.0002331, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0002331, 0.0, 0.0074, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-        
-    if configdict["UsedResolution"] == "SecondApproach":
-    # Resolution for second approach to check systematics and corresponding Tagging Parameter
-        configdict["Resolution"] = { "scaleFactor":{"p0":0.000568, "p1":1.243, "p2":0.0},
-                                     "meanBias":0.0,
-                                     "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                                "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                     "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                    "workName":"workspace",
-                                                    "templateName":"TimeErrorPdf_Bs2DsPi"} }
-        configdict["TaggingCalibration"]["SS"] = {"p0": 0.44907, "dp0": 0.0, "p1": 0.95005, "dp1": 0.0,
-                                                  "cov": [ [2.263e-05, 0.0, 0.0001461, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0001461, 0.0, 0.005204, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.43744, "tagEff":0.63926, "aTagEff":0.0, "use":True}
-        configdict["TaggingCalibration"]["OS"] = {"p0": 0.39432, "dp0": 0.0, "p1": 0.97298, "dp1": 0.0,
-                                                  "cov": [ [4.122e-05, 0.0, 0.0002132, 0.0],
-                                                           [0.0, 1.0, 0.0, 0.0],
-                                                           [0.0002132, 0.0, 0.005549, 0.0],
-                                                           [0.0, 0.0, 0.0, 1.0]],
-                                                  "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-
-
-    configdict["Acceptance"] = { "knots": [0.50, 1.0,  1.5, 2.0, 3.0, 12.0],
-                                 "values": [3.774e-01,5.793e-01,7.752e-01,1.0043e+00,1.0937e+00,1.1872e+00] }
-
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas_Bs2DsPi')
-    configdict["constParams"].append('deltaGammas_Bs2DsPi')
-    configdict["constParams"].append('DeltaMs_Bs2DsPi')
-    configdict["constParams"].append('C_Bs2DsPi')
-    configdict["constParams"].append('Cbar_Bs2DsPi')
-    configdict["constParams"].append('S_Bs2DsPi')
-    configdict["constParams"].append('Sbar_Bs2DsPi')
-    configdict["constParams"].append('D_Bs2DsPi')
-    configdict["constParams"].append('Dbar_Bs2DsPi')
-#    configdict["constParams"].append('tagEff_OS')
-#    configdict["constParams"].append('tagEff_SS')
-    configdict["constParams"].append('aTagEff_OS')
-    configdict["constParams"].append('aTagEff_SS')
-#    configdict["constParams"].append('p0_OS')
-#    configdict["constParams"].append('p0_SS')
-#    configdict["constParams"].append('p1_OS')
-#    configdict["constParams"].append('p1_SS')
-    configdict["constParams"].append('dp0_OS')
-    configdict["constParams"].append('dp0_SS')
-    configdict["constParams"].append('dp1_OS')
-    configdict["constParams"].append('dp1_SS')
-    configdict["constParams"].append('p0_mean_OS')
-    configdict["constParams"].append('p0_mean_SS')
-    configdict["constParams"].append('p1_mean_OS')
-    configdict["constParams"].append('p1_mean_SS')
-    configdict["constParams"].append('dp0_mean_OS')
-    configdict["constParams"].append('dp0_mean_SS')
-    configdict["constParams"].append('dp1_mean_OS')
-    configdict["constParams"].append('dp1_mean_SS')
-    configdict["constParams"].append('average_OS')
-    configdict["constParams"].append('average_SS')
-    configdict["constParams"].append('var1')
-    configdict["constParams"].append('var2')
-    configdict["constParams"].append('var3')
-    configdict["constParams"].append('var4')
-    configdict["constParams"].append('var5')
-    configdict["constParams"].append('var6')
-
-
-
-    #configdict["constParams"].append('DeltaMs')
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFit.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFit.py
deleted file mode 100644
index efcfe375533e37b5f130a4779e0c1afdc89bf001..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFit.py
+++ /dev/null
@@ -1,252 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bs2DsPi"
-    configdict["CharmModes"] = {"KstK","NonRes","PhiPi","KPiPi","PiPiPi"}
-    configdict["Backgrounds"] = ["Bd2DPi","Lb2LcPi","Bs2DsRho","Bs2DsstPi","Bd2DsPi","Bs2DsK"]
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2011","2012"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                 
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.56, "Up": 0.42}, "2012":{"Down": 0.9912, "Up": 0.9988}}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/Bs2DsPi/config_Bs2DsPi_newBDTG.txt"
-    #settings for control plots                                                                                                                                  
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsPi_Nominal", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,    5.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [ 0.1,    1.0     ], "InputName" : "BDTGResponse_3"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration                                                                                               
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.375,  "p1": 0.982, "average": 0.3688}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4429, "p1": 0.977, "average": 0.4377}
-
-    HLTcut = "&&(lab0_Hlt1TrackAllL0Decision_TOS && (lab0_Hlt2IncPhiDecision_TOS ==1 || lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1))"
-    # additional cuts applied to data sets                                                                                    
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0&&lab1_PIDmu<2"+HLTcut,        
-                                               "MC" : "lab2_TAU>0&&lab1_M<200&&lab1_PIDK !=-1000.0"+HLTcut, "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                              
-    # order of particles: KKPi, KPiPi, PiPiPi                                                                                                         
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-    # additional variables in data sets                                                                                                             
-    #configdict["AdditionalVariables"] = {}
-    #configdict["AdditionalVariables"]["tagOmegaSSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_SS_Kaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecSSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_SS_Kaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSMuon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Muon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSMuon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Muon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSElectron"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Electron_PROB"}
-    #configdict["AdditionalVariables"]["tagDecSSElectron"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Electron_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Kaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Kaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSnnetKaon"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_nnetKaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSnnetKaon"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_nnetKaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSVtxCharge"] =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_VtxCharge_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSVtxCharge"]   =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_VtxCharge_DEC" }
-
-
-    #weighting templates by PID eff/misID                                                                                                                                                 
-    configdict["WeightingMassTemplates"]= { "PIDBachEff":            { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"}, 
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyPionEff_0_mu2"},
-                                            "PIDBachMisID":          { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012"}, 
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyKaonMisID_0_mu2"},
-                                            "PIDChildKaonPionMisID": { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"}, 
-                                                                       "Var":["nTracks","lab3_P"], "HistName":"MyPionMisID_0"}, 
-                                            "PIDChildProtonMisID":   { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"}, 
-                                                                       "Var":["nTracks","lab4_P"], "HistName":"MyProtonMisID_pKm5_KPi5"}, 
-                                            "RatioDataMC":{ "FileLabel": {"2011":"#RatioDataMC 2011 PNTr", "2012": "#RatioDataMC 2011 PNTr"}, 
-                                                            "Var":["lab1_P","nTracks"], "HistName":"histRatio"},   
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-
-    #weighting for PID templates                                                                                                                                                          
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacP","nTracks"], "Bins":[30,30] }
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]   = {}
-    configdict["Calibrations"]["2011"]["Proton"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { #"FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                  "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2011", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { #"FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                    "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2011", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-
-
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]   = {}
-    configdict["Calibrations"]["2012"]["Proton"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { #"FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                  "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2012", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { #"FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                    "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2012", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes                                                                                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"NonRes" : 17.4755,   "PhiPi" : 18.3892,   "KstK" : 12.392,    "KPiPi" : 18.0134,   "PiPiPi" : 18.7926},   "Fixed" : True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"NonRes" : 11.5424,   "PhiPi" : 11.4315,   "KstK" : 16.0298,   "KPiPi" : 11.5087,   "PiPiPi" : 11.792},    "Fixed" : True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"NonRes" : -2.18147,  "PhiPi" : -2.18571,  "KstK" : -1.83432,  "KPiPi" : -2.18993,  "PiPiPi" : -2.26617},  "Fixed" : True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"NonRes" : 2.15494,   "PhiPi" : 2.24804,   "KstK" : 1.25656,   "KPiPi" : 2.07243,   "PiPiPi" : 2.06519},   "Fixed" : True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"NonRes" : 2.53609,   "PhiPi" : 2.36718,   "KstK" : 2.82347,   "KPiPi" : 2.67613,   "PiPiPi" : 2.49893},   "Fixed" : True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"NonRes" : 0.518479,  "PhiPi" : 0.410215,  "KstK" : 5.16839,   "KPiPi" : 0.580003,  "PiPiPi" : 0.564315},  "Fixed" : True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.5,         "PhiPi":0.5,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},  "Fixed":True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"NonRes":1.00,        "PhiPi":1.0,          "Kstk":1.0,        "KPiPi":1.0,         "PiPiPi":1.0}, "Fixed":False}
-
-    #Ds signal shapes                                                                                                                                       
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False} 
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"NonRes" : 5.94251,   "PhiPi" : 5.37138,   "KstK" : 5.63019,   "KPiPi" : 6.6889,    "PiPiPi" : 8.51918},  "Fixed" : True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"NonRes" : 5.50472,   "PhiPi" : 5.89377,   "KstK" : 6.17574,   "KPiPi" : 7.48899,   "PiPiPi" : 8.62049},  "Fixed" : True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"NonRes" : -1.1612,   "PhiPi" : -1.1131,   "KstK" : -1.18225,  "KPiPi" : -1.16591,  "PiPiPi" : -1.07096}, "Fixed" : True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"NonRes" : 1.2832,    "PhiPi" : 1.14251,   "KstK" : 1.26344,   "KPiPi" : 1.02116,   "PiPiPi" : 0.978857}, "Fixed" : True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"NonRes" : 16.048,    "PhiPi" : 8.68961,   "KstK" : 11.378,    "KPiPi" : 10.0,       "PiPiPi" : 19.9993},  "Fixed" : True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"NonRes" : 3.68624,   "PhiPi" : 5.8552,    "KstK" : 5.88566,   "KPiPi" : 10.4138,   "PiPiPi" : 5.36778},  "Fixed" : True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,        "KstK":0.50,        "KPiPi":0.50,        "PiPiPi":0.50}, "Fixed":True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"NonRes":1.00,        "PhiPi":1.00,        "KstK":1.00,        "KPiPi":1.00,        "PiPiPi":1.00}, "Fixed":False}
-
-    # combinatorial background                                                                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"NonRes":-3.5211e-02,  "PhiPi":-3.0873e-02,  "KstK":-2.3392e-02, "KPiPi":-1.0361e-02, "PiPiPi":-1.5277e-02},"Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"NonRes":0.0,       "PhiPi":0.0,       "KstK":0.0,      "KPiPi":0.0,         "PiPiPi":0.0}, 
-                                                   "Fixed":True }
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"NonRes":4.3067e-01,   "PhiPi":6.5400e-01,   "KstK":3.7409e-01,  "KPiPi":0.5,         "PiPiPi":0.5}, "Fixed":False}
-    
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" #"ExponentialPlusDoubleCrystalBallWithWidthRatioSharedMean"
-    configdict["DsCombinatorialShape"]["sigma1"]  = {"Run1": {"NonRes":5.2639e+00,  "PhiPi":5.7789e+00,  "KstK":5.5277e+00,  "KPiPi":7.8831e+00,  "PiPiPi":7.8627e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["sigma2"]  = {"Run1": {"NonRes":5.7588e+00,  "PhiPi":5.3142e+00,  "KstK":5.9173e+00,  "KPiPi":6.5553e+00,  "PiPiPi":9.0180e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha1"]  = {"Run1": {"NonRes":-1.1429e+00, "PhiPi":-1.0496e+00, "KstK":-1.1662e+00, "KPiPi":-1.2500e+00, "PiPiPi":-1.1731e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha2"]  = {"Run1": {"NonRes":1.1400e+00,  "PhiPi":1.1819e+00,  "KstK":1.1958e+00,  "KPiPi":1.3706e+00,  "PiPiPi":9.0873e-01},"Fixed":True}
-    configdict["DsCombinatorialShape"]["n1"]      = {"Run1": {"NonRes":1.1892e+01,  "PhiPi":4.9291e+01,  "KstK":1.7661e+01,  "KPiPi":5.0000e+01,  "PiPiPi":8.5777e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["n2"]      = {"Run1": {"NonRes":7.6655e+00,  "PhiPi":4.9162e+00,  "KstK":9.4543e+00,  "KPiPi":3.0195e+00,  "PiPiPi":2.7506e+01}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,        "KstK":0.50,        "KPiPi":0.50,        "PiPiPi":0.50}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["R"]       = {"Run1": {"NonRes":1.00,         "PhiPi":1.5,         "Kstk":1.5,         "KPiPi":1.5,         "PiPiPi":1.5}, "Fixed":False}
-    configdict["DsCombinatorialShape"]["cD"]      = {"Run1": {"NonRes":-5.7520e-03,  "PhiPi":-5.7273e-03, "KstK":-8.3967e-03, "KPiPi":-4.9193e-03, "PiPiPi":-4.5455e-02},"Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"NonRes":0.88620,      "PhiPi":0.37379,     "KstK":0.59093,     "KPiPi":0.5,         "PiPiPi":0.5},"Fixed":False}
-
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "FixedWithKaonPion"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK2"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-
-
-    #Bd2Dsh background
-    #shape for BeautyMass, for CharmMass as well as BacPIDK taken by default the same as signal 
-    configdict["Bd2DsPiShape"] = {}
-    configdict["Bd2DsPiShape"]["BeautyMass"] = {}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["type"]    = "ShiftedSignal"
-    configdict["Bd2DsPiShape"]["BeautyMass"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["scale1"]  = {"Run1": {"All": 1.00808721452}, "Fixed":True}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["scale2"]  = {"Run1": {"All": 1.03868673310}, "Fixed":True}
-
-
-    #
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g1_f2_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.43, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.51, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.43, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.51, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-
-
-    #expected yields                                                                                                                                                       
-    configdict["Yields"] = {}
-    #configdict["Yields"]["Bd2DPi"]          = {"2011": { "NonRes":502.0,   "PhiPi":25.5,    "KstK":366.0,   "KPiPi":0.0,     "PiPiPi":0.0},
-    #                                           "2012": { "NonRes":1116.0,  "PhiPi":61.0,    "KstK":903.0,   "KPiPi":0.0,     "PiPiPi":0.0},  "Fixed":True}
-    configdict["Yields"]["Bd2DPi"]          = {"2011": { "NonRes":50.4,    "PhiPi":3.5,     "KstK":10.3,    "KPiPi":9.8,     "PiPiPi":0.0},
-                                               "2012": { "NonRes":100.5,   "PhiPi":7.8,     "KstK":21.4,    "KPiPi":20.4,    "PiPiPi":0.0},  "Fixed":True}
-    #configdict["Yields"]["Lb2LcPi"]         = {"2011": { "NonRes":215.6,   "PhiPi":39.0,    "KstK":63.0,    "KPiPi":1.4,     "PiPiPi":0.0},
-    #                                           "2012": { "NonRes":560.0,   "PhiPi":92.0,    "KstK":164.0,   "KPiPi":4.6,     "PiPiPi":0.0},  "Fixed":True}
-    configdict["Yields"]["Lb2LcPi"]         = {"2011": { "NonRes":140.4,   "PhiPi":30.7,    "KstK":46.2,    "KPiPi":0.8,     "PiPiPi":0.0},
-                                               "2012": { "NonRes":342.0,   "PhiPi":64.7,    "KstK":108.0,   "KPiPi":3.6,     "PiPiPi":0.0},  "Fixed":True}
-
-    configdict["Yields"]["Bs2DsK"]          = {"2011": { "NonRes":30.5,    "PhiPi":77.8,    "KstK":41.6,    "KPiPi":21.5,    "PiPiPi":44.6},
-                                               "2012": { "NonRes":85.7,    "PhiPi":184.1,   "KstK":121.0,   "KPiPi":44.8,    "PiPiPi":113.8}, "Fixed":True}
-    #configdict["Yields"]["Bs2DsK"]          = {"2011": { "NonRes":46.2,    "PhiPi":69.8,    "KstK":67.6,    "KPiPi":33.3,    "PiPiPi":61.6},
-    #                                           "2012": { "NonRes":118.7,   "PhiPi":171.1,   "KstK":167.0,   "KPiPi":87.8,    "PiPiPi":156.0}, "Fixed":True}
-    configdict["Yields"]["Bs2DsDsstPiRho"]  = {"2011": { "NonRes":100.0,   "PhiPi":100.0,   "KstK":100.0,   "KPiPi":100.0,   "PiPiPi":100.0},
-                                               "2012": { "NonRes":200.0,   "PhiPi":200.0,   "KstK":200.0,   "KPiPi":200.0,   "PiPiPi":200.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]         = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                               "2012": { "NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},"Fixed":False}
-    configdict["Yields"]["Signal"]          = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                               "2012": { "NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},"Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bd2DPi", "Lb2LcPi", "Bs2DsDsstPiRho", "Bs2DsK"] 
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kRed, kBlue-10, kGreen+3]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":2.5}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.7, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.20,0.9], "ScaleYSize":1.2}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitBDTG1.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitBDTG1.py
deleted file mode 100644
index ed6aeb344c80eb24baa248c649bf362487acd230..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitBDTG1.py
+++ /dev/null
@@ -1,231 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bs2DsPi"
-    configdict["CharmModes"] = {"KstK","NonRes","PhiPi","KPiPi","PiPiPi"}
-    configdict["Backgrounds"] = ["Bd2DPi","Lb2LcPi","Bs2DsRho","Bs2DsstPi","Bd2DsPi","Bs2DsK"]
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2011","2012"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                  
-    #configdict["IntegratedLuminosity"] = {"2011": {"Down": 0.59, "Up": 0.44}, "2012":{"Down": 0.9894, "Up": 0.9985}}
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.56, "Up": 0.42}, "2012":{"Down": 0.9912, "Up": 0.9988}}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/Bs2DsPi/config_Bs2DsPi_newBDTG.txt"
-    #settings for control plots                                                                                                                                                           
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsPi_BDTG1", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,    5.0     ], "InputName" : "lab1_PIDK"} #-7.0,6.0
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.1,     0.95    ], "InputName" : "BDTGResponse_3"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration                                                                                               
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.375,  "p1": 0.982, "average": 0.3688}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4429, "p1": 0.977, "average": 0.4377}
-
-    HLTcut = "&&(lab0_Hlt1TrackAllL0Decision_TOS && (lab0_Hlt2IncPhiDecision_TOS ==1 || lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1))"
-    # additional cuts applied to data sets                                                                                    
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0&&lab1_PIDmu<2"+HLTcut,        
-                                               "MC" : "lab2_TAU>0&&lab1_M<200&&lab1_PIDK !=-1000.0"+HLTcut, "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                              
-    # order of particles: KKPi, KPiPi, PiPiPi                                                                                                         
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-    # additional variables in data sets                                                                                                             
-    #configdict["AdditionalVariables"] = {}
-    #configdict["AdditionalVariables"]["tagOmegaSSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_SS_Kaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecSSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_SS_Kaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSMuon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Muon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSMuon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Muon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSElectron"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Electron_PROB"}
-    #configdict["AdditionalVariables"]["tagDecSSElectron"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Electron_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Kaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Kaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSnnetKaon"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_nnetKaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSnnetKaon"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_nnetKaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSVtxCharge"] =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_VtxCharge_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSVtxCharge"]   =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_VtxCharge_DEC" }
-
-
-    #weighting templates by PID eff/misID                                                                                                                                                 
-    configdict["WeightingMassTemplates"]= { "PIDBachEff":            { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyPionEff_0_mu2"},
-                                            "PIDBachMisID":          { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyKaonMisID_0_mu2"},
-                                            "PIDChildKaonPionMisID": { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab3_P"], "HistName":"MyPionMisID_0"},
-                                            "PIDChildProtonMisID":   { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"},
-                                                                       "Var":["nTracks","lab4_P"], "HistName":"MyProtonMisID_pKm5_KPi5"},
-                                            "RatioDataMC":{ "FileLabel": {"2011":"#RatioDataMC 2011 PNTr", "2012": "#RatioDataMC 2012 PNTr"},
-                                                            "Var":["lab1_P","nTracks"], "HistName":"histRatio"},
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-
-
-    #weighting for PID templates                                                                                                                                                          
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacP","nTracks"], "Bins":[30,30] }
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]   = {}
-    configdict["Calibrations"]["2011"]["Proton"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2011", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2011", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]   = {}
-    configdict["Calibrations"]["2012"]["Proton"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1.root",
-                                                                     "WorkName":"workspace", "DataName":"dataCombBkg_up_2012", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2012", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes                                                                                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"NonRes" : 17.4755,   "PhiPi" : 18.3892,   "KstK" : 12.392,    "KPiPi" : 18.0134,   "PiPiPi" : 18.7926},   "Fixed" : True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"NonRes" : 11.5424,   "PhiPi" : 11.4315,   "KstK" : 16.0298,   "KPiPi" : 11.5087,   "PiPiPi" : 11.792},    "Fixed" : True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"NonRes" : -2.18147,  "PhiPi" : -2.18571,  "KstK" : -1.83432,  "KPiPi" : -2.18993,  "PiPiPi" : -2.26617},  "Fixed" : True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"NonRes" : 2.15494,   "PhiPi" : 2.24804,   "KstK" : 1.25656,   "KPiPi" : 2.07243,   "PiPiPi" : 2.06519},   "Fixed" : True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"NonRes" : 2.53609,   "PhiPi" : 2.36718,   "KstK" : 2.82347,   "KPiPi" : 2.67613,   "PiPiPi" : 2.49893},   "Fixed" : True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"NonRes" : 0.518479,  "PhiPi" : 0.410215,  "KstK" : 5.16839,   "KPiPi" : 0.580003,  "PiPiPi" : 0.564315},  "Fixed" : True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.5,         "PhiPi":0.5,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},  "Fixed":True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"NonRes":1.00,        "PhiPi":1.0,         "Kstk":1.0,         "KPiPi":1.0,         "PiPiPi":1.0}, "Fixed":False}
-
-    #Ds signal shapes                                                                                                                                       
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False} 
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"NonRes" : 5.94251,   "PhiPi" : 5.37138,   "KstK" : 5.63019,   "KPiPi" : 6.6889,    "PiPiPi" : 8.51918},  "Fixed" : True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"NonRes" : 5.50472,   "PhiPi" : 5.89377,   "KstK" : 6.17574,   "KPiPi" : 7.48899,   "PiPiPi" : 8.62049},  "Fixed" : True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"NonRes" : -1.1612,   "PhiPi" : -1.1131,   "KstK" : -1.18225,  "KPiPi" : -1.16591,  "PiPiPi" : -1.07096}, "Fixed" : True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"NonRes" : 1.2832,    "PhiPi" : 1.14251,   "KstK" : 1.26344,   "KPiPi" : 1.02116,   "PiPiPi" : 0.978857}, "Fixed" : True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"NonRes" : 16.048,    "PhiPi" : 8.68961,   "KstK" : 11.378,    "KPiPi" : 10.0,       "PiPiPi" : 19.9993},  "Fixed" : True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"NonRes" : 3.68624,   "PhiPi" : 5.8552,    "KstK" : 5.88566,   "KPiPi" : 10.4138,   "PiPiPi" : 5.36778},  "Fixed" : True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,        "KstK":0.50,        "KPiPi":0.50,         "PiPiPi":0.50}, "Fixed":True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"NonRes":1.00,        "PhiPi":1.00,        "KstK":1.00,        "KPiPi":1.00,         "PiPiPi":1.00}, "Fixed":False}
-
-    # combinatorial background                                                                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"NonRes":-4.5211e-03,  "PhiPi":-7.0873e-03,  "KstK":-4.3392e-03, "KPiPi":-4.0361e-03, "PiPiPi":-4.5277e-03},"Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"NonRes":0.0,       "PhiPi":0.0,       "KstK":0.0,      "KPiPi":0.0,         "PiPiPi":0.0}, 
-                                                   "Fixed":True }
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"NonRes":4.3067e-01,   "PhiPi":6.5400e-01,   "KstK":3.7409e-01,  "KPiPi":0.5,         "PiPiPi":0.5}, "Fixed":False}
-    
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" #"ExponentialPlusDoubleCrystalBallWithWidthRatioSharedMean
-    configdict["DsCombinatorialShape"]["cD"]      = {"Run1": {"NonRes":-5.7520e-03,  "PhiPi":-5.7273e-03, "KstK":-8.3967e-03, "KPiPi":-4.9193e-03, "PiPiPi":-4.5455e-02},"Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"NonRes":0.88620,      "PhiPi":0.37379,     "KstK":0.59093,     "KPiPi":0.5,         "PiPiPi":0.5},"Fixed":False}
-
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK2"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-
-    #Bd2Dsh background
-    #shape for BeautyMass, for CharmMass as well as BacPIDK taken by default the same as signal 
-    configdict["Bd2DsPiShape"] = {}
-    configdict["Bd2DsPiShape"]["BeautyMass"] = {}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["type"]    = "ShiftedSignal"
-    configdict["Bd2DsPiShape"]["BeautyMass"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["scale1"]  = {"Run1": {"All": 1.00808721452}, "Fixed":True}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["scale2"]  = {"Run1": {"All": 1.03868673310}, "Fixed":True}
-
-    #
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g1_f2_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.43, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.51, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.43, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.51, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-
-
-    #expected yields                                                                                                                                                       
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bd2DPi"]          = {"2011": { "NonRes":25.6,    "PhiPi":1.7,     "KstK":5.2,     "KPiPi":4.9,     "PiPiPi":0.0},
-                                               "2012": { "NonRes":51.1,    "PhiPi":3.9,     "KstK":10.8,    "KPiPi":10.3,     "PiPiPi":0.0},  "Fixed":True}
-    configdict["Yields"]["Lb2LcPi"]         = {"2011": { "NonRes":69.1,    "PhiPi":15.4,    "KstK":22.7,    "KPiPi":0.4,     "PiPiPi":0.0},
-                                               "2012": { "NonRes":168.9,   "PhiPi":32.1,    "KstK":53.3,    "KPiPi":1.7,     "PiPiPi":0.0},  "Fixed":True}
-    configdict["Yields"]["Bs2DsK"]          = {"2011": { "NonRes":13.9,    "PhiPi":35.4,    "KstK":19.0,    "KPiPi":9.8,     "PiPiPi":20.3},
-                                               "2012": { "NonRes":39.0,    "PhiPi":83.9,    "KstK":55.1,    "KPiPi":20.4,    "PiPiPi":51.9}, "Fixed":True}
-    configdict["Yields"]["Bs2DsDsstPiRho"]  = {"2011": { "NonRes":100.0,   "PhiPi":100.0,   "KstK":100.0,   "KPiPi":100.0,   "PiPiPi":100.0},
-                                               "2012": { "NonRes":200.0,   "PhiPi":200.0,   "KstK":200.0,   "KPiPi":200.0,   "PiPiPi":200.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]         = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                               "2012": { "NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},"Fixed":False}
-    configdict["Yields"]["Signal"]          = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                               "2012": { "NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},"Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bd2DPi", "Lb2LcPi", "Bs2DsDsstPiRho", "Bs2DsK"] 
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kRed, kBlue-10, kGreen+3]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":2.5}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.7, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.20,0.9], "ScaleYSize":1.2}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitBDTG2.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitBDTG2.py
deleted file mode 100644
index 07ffe58e7037a14cbdca0e23b05024eca854cbe3..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitBDTG2.py
+++ /dev/null
@@ -1,243 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bs2DsPi"
-    configdict["CharmModes"] = {"KstK","NonRes","PhiPi","KPiPi","PiPiPi"}
-    configdict["Backgrounds"] = ["Bd2DPi","Lb2LcPi","Bs2DsRho","Bs2DsstPi","Bd2DsPi","Bs2DsK"]
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2011","2012"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                  
-    #configdict["IntegratedLuminosity"] = {"2011": {"Down": 0.59, "Up": 0.44}, "2012":{"Down": 0.9894, "Up": 0.9985}}
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.56, "Up": 0.42}, "2012":{"Down": 0.9912, "Up": 0.9988}}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/Bs2DsPi/config_Bs2DsPi_newBDTG.txt"
-    #settings for control plots                                                                                                                                                           
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsPi_BDTG2", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,    4.9     ], "InputName" : "lab1_PIDK"} #-7.0,6.0
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.95,     1.0    ], "InputName" : "BDTGResponse_3"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration                                                                                               
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.375,  "p1": 0.982, "average": 0.3688}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4429, "p1": 0.977, "average": 0.4377}
-
-    HLTcut = "&&(lab0_Hlt1TrackAllL0Decision_TOS && (lab0_Hlt2IncPhiDecision_TOS ==1 || lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1))"
-    # additional cuts applied to data sets                                                                                    
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0&&lab1_PIDmu<2"+HLTcut,        
-                                               "MC" : "lab2_TAU>0&&lab1_M<200&&lab1_PIDK !=-1000.0"+HLTcut, "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                              
-    # order of particles: KKPi, KPiPi, PiPiPi                                                                                                         
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-    # additional variables in data sets                                                                                                             
-    #configdict["AdditionalVariables"] = {}
-    #configdict["AdditionalVariables"]["tagOmegaSSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_SS_Kaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecSSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_SS_Kaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSMuon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Muon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSMuon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Muon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSElectron"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Electron_PROB"}
-    #configdict["AdditionalVariables"]["tagDecSSElectron"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Electron_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Kaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Kaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSnnetKaon"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_nnetKaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSnnetKaon"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_nnetKaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSVtxCharge"] =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_VtxCharge_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSVtxCharge"]   =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_VtxCharge_DEC" }
-
-
-    #weighting templates by PID eff/misID                                                                                                                                                 
-    configdict["WeightingMassTemplates"]= { "PIDBachEff":            { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyPionEff_0_mu2"},
-                                            "PIDBachMisID":          { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyKaonMisID_0_mu2"},
-                                            "PIDChildKaonPionMisID": { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab3_P"], "HistName":"MyPionMisID_0"},
-                                            "PIDChildProtonMisID":   { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"},
-                                                                       "Var":["nTracks","lab4_P"], "HistName":"MyProtonMisID_pKm5_KPi5"},
-                                            "RatioDataMC":{ "FileLabel": {"2011":"#RatioDataMC 2011 PNTr", "2012": "#RatioDataMC 2012 PNTr"},
-                                                            "Var":["lab1_P","nTracks"], "HistName":"histRatio"},
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-
-
-    #weighting for PID templates                                                                                                                                                          
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacP","nTracks"], "Bins":[30,30] }
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]   = {}
-    configdict["Calibrations"]["2011"]["Proton"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2011", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2011", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]   = {}
-    configdict["Calibrations"]["2012"]["Proton"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1.root",
-                                                                     "WorkName":"workspace", "DataName":"dataCombBkg_up_2012", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2012", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes                                                                                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"NonRes":1.6824e+01,  "PhiPi":1.6601e+01,  "KstK":1.6537e+01,  "KPiPi":1.6489e+01,  "PiPiPi":1.7204e+01},  "Fixed":True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"NonRes":1.0962e+01,  "PhiPi":1.1395e+01,  "KstK":1.1299e+01,  "KPiPi":1.0970e+01,  "PiPiPi":1.1561e+01},  "Fixed":True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"NonRes":-2.4265e+00, "PhiPi":-2.2224e+00, "KstK":-2.2993e+00, "KPiPi":-2.8905e+00, "PiPiPi":-2.1065e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"NonRes":2.1704e+00,  "PhiPi":2.1271e+00,  "KstK":2.0747e+00,  "KPiPi":2.1790e+00,  "PiPiPi":2.0236e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"NonRes":2.6914e+00,  "PhiPi":3.1509e+00,  "KstK":3.1136e+00,  "KPiPi":1.5628e+00,  "PiPiPi":4.0379e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"NonRes":6.0871e-01,  "PhiPi":6.0644e-01,  "KstK":7.6784e-01,  "KPiPi":5.0557e-01,  "PiPiPi":8.1528e-01},  "Fixed":True}
-    #configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"NonRes" : 17.4755,   "PhiPi" : 18.3892,   "KstK" : 12.392,    "KPiPi" : 18.0134,   "PiPiPi" : 18.7926},   "Fixed" : True}
-    #configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"NonRes" : 11.5424,   "PhiPi" : 11.4315,   "KstK" : 16.0298,   "KPiPi" : 11.5087,   "PiPiPi" : 11.792},    "Fixed" : True}
-    #configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"NonRes" : -2.18147,  "PhiPi" : -2.18571,  "KstK" : -1.83432,  "KPiPi" : -2.18993,  "PiPiPi" : -2.26617},  "Fixed" : True}
-    #configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"NonRes" : 2.15494,   "PhiPi" : 2.24804,   "KstK" : 1.25656,   "KPiPi" : 2.07243,   "PiPiPi" : 2.06519},   "Fixed" : True}
-    #configdict["BsSignalShape"]["n1"]      = {"Run1": {"NonRes" : 2.53609,   "PhiPi" : 2.36718,   "KstK" : 2.82347,   "KPiPi" : 2.67613,   "PiPiPi" : 2.49893},   "Fixed" : True}
-    #configdict["BsSignalShape"]["n2"]      = {"Run1": {"NonRes" : 0.518479,  "PhiPi" : 0.410215,  "KstK" : 5.16839,   "KPiPi" : 0.580003,  "PiPiPi" : 0.564315},  "Fixed" : True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.5,         "PhiPi":0.5,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},  "Fixed":True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"NonRes":1.00,        "PhiPi":1.0,          "Kstk":1.0,        "KPiPi":1.0,         "PiPiPi":1.0}, "Fixed":False}
-
-    #Ds signal shapes                                                                                                                                       
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False} 
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"NonRes":6.4256e+00,  "PhiPi":5.1958e+00,  "KstK":4.4044e+00,  "KPiPi":7.0825e+00,  "PiPiPi":8.2159e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"NonRes":4.1796e+00,  "PhiPi":5.1946e+00,  "KstK":6.7061e+00,  "KPiPi":6.0212e+00,  "PiPiPi":7.3552e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"NonRes":-2.1805e+00, "PhiPi":-1.3555e+00, "KstK":-3.0000e+00, "KPiPi":-1.7033e+00, "PiPiPi":-1.4847e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"NonRes":1.7124e+00,  "PhiPi":1.3204e+00,  "KstK":2.6063e+00,  "KPiPi":1.4677e+00,  "PiPiPi":1.2645e+00},"Fixed":True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"NonRes":1.8626e+01,  "PhiPi":9.9998e+01,  "KstK":9.9163e+01,  "KPiPi":2.1268e+01,  "PiPiPi":9.9998e+01}, "Fixed":True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"NonRes":1.0001e+01,  "PhiPi":1.0000e+02,  "KstK":9.5636e+01,  "KPiPi":9.9748e+01,  "PiPiPi":1.0000e+02}, "Fixed":True}
-    #configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"NonRes" : 5.94251,   "PhiPi" : 5.37138,   "KstK" : 5.63019,   "KPiPi" : 6.6889,    "PiPiPi" : 8.51918},  "Fixed" : True}
-    #configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"NonRes" : 5.50472,   "PhiPi" : 5.89377,   "KstK" : 6.17574,   "KPiPi" : 7.48899,   "PiPiPi" : 8.62049},  "Fixed" : True}
-    #configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"NonRes" : -1.1612,   "PhiPi" : -1.1131,   "KstK" : -1.18225,  "KPiPi" : -1.16591,  "PiPiPi" : -1.07096}, "Fixed" : True}
-    #configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"NonRes" : 1.2832,    "PhiPi" : 1.14251,   "KstK" : 1.26344,   "KPiPi" : 1.02116,   "PiPiPi" : 0.978857}, "Fixed" : True}
-    #configdict["DsSignalShape"]["n1"]      = {"Run1": {"NonRes" : 16.048,    "PhiPi" : 8.68961,   "KstK" : 11.378,    "KPiPi" : 10.0,       "PiPiPi" : 19.9993},  "Fixed" : True}
-    #configdict["DsSignalShape"]["n2"]      = {"Run1": {"NonRes" : 3.68624,   "PhiPi" : 5.8552,    "KstK" : 5.88566,   "KPiPi" : 10.4138,   "PiPiPi" : 5.36778},  "Fixed" : True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,        "KstK":0.50,        "KPiPi":0.50,        "PiPiPi":0.50}, "Fixed":True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"NonRes":1.00,        "PhiPi":1.00,        "KstK":1.00,        "KPiPi":1.00,        "PiPiPi":1.00}, "Fixed":False}
-
-    # combinatorial background                                                                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"] = "Exponential"
-    configdict["BsCombinatorialShape"]["cB"]   = {"Run1":{"NonRes":-8.1530e-03,  "PhiPi":-8.2354e-03,  "KstK":-8.3675e-03, "KPiPi":-8.8158e-03, "PiPiPi":-8.0890e-03}, "Fixed":False}
-    
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "Exponential" #PlusSignal" 
-    configdict["DsCombinatorialShape"]["cB"]      = {"Run1": {"NonRes":-5.7520e-03,  "PhiPi":-5.7273e-03, "KstK":-8.3967e-03, "KPiPi":-4.9193e-03, "PiPiPi":-4.5455e-02},"Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"NonRes":0.88620,      "PhiPi":0.37379,     "KstK":0.59093,     "KPiPi":0.5,         "PiPiPi":0.5},"Fixed":False}
-
-
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "Run1":{"All":0.5}, "Fixed":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK2"]   = { "Run1":{"All":0.5}, "Fixed":False }
-
-
-    #Bd2Dsh background
-    #shape for BeautyMass, for CharmMass as well as BacPIDK taken by default the same as signal 
-    configdict["Bd2DsPiShape"] = {}
-    configdict["Bd2DsPiShape"]["BeautyMass"] = {}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["type"]    = "ShiftedSignal"
-    configdict["Bd2DsPiShape"]["BeautyMass"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["scale1"]  = {"Run1": {"All": 1.00808721452}, "Fixed":True}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["scale2"]  = {"Run1": {"All": 1.03868673310}, "Fixed":True}
-
-    #
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g1_f2_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.43, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.51, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.43, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.51, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-
-
-    #expected yields                                                                                                                                                       
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bd2DPi"]          = {"2011": { "NonRes":24.8,    "PhiPi":1.7,     "KstK":5.0,     "KPiPi":4.0,     "PiPiPi":0.0},
-                                               "2012": { "NonRes":49.4,    "PhiPi":3.8,     "KstK":10.5,    "KPiPi":10.0,     "PiPiPi":0.0},  "Fixed":True}
-    configdict["Yields"]["Lb2LcPi"]         = {"2011": { "NonRes":70.9,    "PhiPi":15.0,    "KstK":23.3,    "KPiPi":0.4,     "PiPiPi":0.0},
-                                               "2012": { "NonRes":173.1,   "PhiPi":32.0,    "KstK":54.6,    "KPiPi":1.8,     "PiPiPi":0.0},  "Fixed":True}
-    configdict["Yields"]["Bs2DsK"]          = {"2011": { "NonRes":16.6,    "PhiPi":42.3,    "KstK":22.6,    "KPiPi":11.7,    "PiPiPi":25.0},
-                                               "2012": { "NonRes":49.6,    "PhiPi":100.2,   "KstK":65.8,    "KPiPi":24.4,    "PiPiPi":61.9}, "Fixed":True}
-    configdict["Yields"]["Bs2DsDsstPiRho"]  = {"2011": { "NonRes":100.0,   "PhiPi":100.0,   "KstK":100.0,   "KPiPi":100.0,   "PiPiPi":100.0},
-                                               "2012": { "NonRes":200.0,   "PhiPi":200.0,   "KstK":200.0,   "KPiPi":200.0,   "PiPiPi":200.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]         = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                               "2012": { "NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},"Fixed":False}
-    configdict["Yields"]["Signal"]          = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                               "2012": { "NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},"Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bd2DPi", "Lb2LcPi", "Bs2DsDsstPiRho", "Bs2DsK"] 
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kRed, kBlue-10, kGreen+3]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":2.5}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.7, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.20,0.9], "ScaleYSize":1.2}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitDown.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitDown.py
deleted file mode 100644
index 21870c9efc9df6f03a4b8a3536d2e5f30f6001c1..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitDown.py
+++ /dev/null
@@ -1,251 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bs2DsPi"
-    configdict["CharmModes"] = {"KstK","NonRes","PhiPi","KPiPi","PiPiPi"}
-    configdict["Backgrounds"] = ["Bd2DPi","Lb2LcPi","Bs2DsRho","Bs2DsstPi","Bd2DsPi","Bs2DsK"]
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2011","2012"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                 
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.56, "Up": 0.42}, "2012":{"Down": 0.9912, "Up": 0.9988}}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/Bs2DsPi/config_Bs2DsPi_newBDTG.txt"
-    #settings for control plots                                                                                                                                                           
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsPi_Nominal", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,    5.0     ], "InputName" : "lab1_PIDK"} #-7.0,6.0
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [ 0.2,    1.0     ], "InputName" : "BDTGResponse_3"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration                                                                                               
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.375,  "p1": 0.982, "average": 0.3688}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4429, "p1": 0.977, "average": 0.4377}
-
-    HLTcut = "&&(lab0_Hlt1TrackAllL0Decision_TOS && (lab0_Hlt2IncPhiDecision_TOS ==1 || lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1))"
-    # additional cuts applied to data sets                                                                                    
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0&&lab1_PIDmu<2"+HLTcut,        
-                                               "MC" : "lab2_TAU>0&&lab1_M<200&&lab1_PIDK !=-1000.0"+HLTcut, "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                              
-    # order of particles: KKPi, KPiPi, PiPiPi                                                                                                         
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-    # additional variables in data sets                                                                                                             
-    #configdict["AdditionalVariables"] = {}
-    #configdict["AdditionalVariables"]["tagOmegaSSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_SS_Kaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecSSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_SS_Kaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSMuon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Muon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSMuon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Muon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSElectron"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Electron_PROB"}
-    #configdict["AdditionalVariables"]["tagDecSSElectron"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Electron_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Kaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Kaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSnnetKaon"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_nnetKaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSnnetKaon"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_nnetKaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSVtxCharge"] =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_VtxCharge_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSVtxCharge"]   =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_VtxCharge_DEC" }
-
-
-    #weighting templates by PID eff/misID                                                                                                                                                 
-    configdict["WeightingMassTemplates"]= { "PIDBachEff":            { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"}, 
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyPionEff_0_mu2"},
-                                            "PIDBachMisID":          { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012"}, 
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyKaonMisID_0_mu2"},
-                                            "PIDChildKaonPionMisID": { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"}, 
-                                                                       "Var":["nTracks","lab3_P"], "HistName":"MyPionMisID_0"}, 
-                                            "PIDChildProtonMisID":   { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"}, 
-                                                                       "Var":["nTracks","lab4_P"], "HistName":"MyProtonMisID_pKm5_KPi5"}, 
-                                            "RatioDataMC":{ "FileLabel": {"2011":"#RatioDataMC 2011 PNTr", "2012": "#RatioDataMC 2011 PNTr"}, 
-                                                            "Var":["lab1_P","nTracks"], "HistName":"histRatio"},   
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-
-    #weighting for PID templates                                                                                                                                                          
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[30,30] }
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]   = {}
-    configdict["Calibrations"]["2011"]["Proton"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { #"FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                  "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2011", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { #"FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                    "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2011", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-
-
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]   = {}
-    configdict["Calibrations"]["2012"]["Proton"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { #"FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                  "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2012", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { #"FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                    "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2012", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes                                                                                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"NonRes" : 17.4755,   "PhiPi" : 18.3892,   "KstK" : 12.392,    "KPiPi" : 18.0134,   "PiPiPi" : 18.7926},   "Fixed" : True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"NonRes" : 11.5424,   "PhiPi" : 11.4315,   "KstK" : 16.0298,   "KPiPi" : 11.5087,   "PiPiPi" : 11.792},    "Fixed" : True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"NonRes" : -2.18147,  "PhiPi" : -2.18571,  "KstK" : -1.83432,  "KPiPi" : -2.18993,  "PiPiPi" : -2.26617},  "Fixed" : True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"NonRes" : 2.15494,   "PhiPi" : 2.24804,   "KstK" : 1.25656,   "KPiPi" : 2.07243,   "PiPiPi" : 2.06519},   "Fixed" : True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"NonRes" : 2.53609,   "PhiPi" : 2.36718,   "KstK" : 2.82347,   "KPiPi" : 2.67613,   "PiPiPi" : 2.49893},   "Fixed" : True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"NonRes" : 0.518479,  "PhiPi" : 0.410215,  "KstK" : 5.16839,   "KPiPi" : 0.580003,  "PiPiPi" : 0.564315},  "Fixed" : True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.5,         "PhiPi":0.5,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},  "Fixed":True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"NonRes":1.00,        "PhiPi":1.0,          "Kstk":1.0,        "KPiPi":1.0,         "PiPiPi":1.0}, "Fixed":False}
-
-    #Ds signal shapes                                                                                                                                       
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False} 
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"NonRes" : 5.94251,   "PhiPi" : 5.37138,   "KstK" : 5.63019,   "KPiPi" : 6.6889,    "PiPiPi" : 8.51918},  "Fixed" : True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"NonRes" : 5.50472,   "PhiPi" : 5.89377,   "KstK" : 6.17574,   "KPiPi" : 7.48899,   "PiPiPi" : 8.62049},  "Fixed" : True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"NonRes" : -1.1612,   "PhiPi" : -1.1131,   "KstK" : -1.18225,  "KPiPi" : -1.16591,  "PiPiPi" : -1.07096}, "Fixed" : True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"NonRes" : 1.2832,    "PhiPi" : 1.14251,   "KstK" : 1.26344,   "KPiPi" : 1.02116,   "PiPiPi" : 0.978857}, "Fixed" : True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"NonRes" : 16.048,    "PhiPi" : 8.68961,   "KstK" : 11.378,    "KPiPi" : 10.0,       "PiPiPi" : 19.9993},  "Fixed" : True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"NonRes" : 3.68624,   "PhiPi" : 5.8552,    "KstK" : 5.88566,   "KPiPi" : 10.4138,   "PiPiPi" : 5.36778},  "Fixed" : True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,        "KstK":0.50,        "KPiPi":0.50,        "PiPiPi":0.50}, "Fixed":True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"NonRes":1.00,        "PhiPi":1.00,        "KstK":1.00,        "KPiPi":1.00,        "PiPiPi":1.00}, "Fixed":False}
-
-    # combinatorial background                                                                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"NonRes":-3.5211e-02,  "PhiPi":-3.0873e-02,  "KstK":-2.3392e-02, "KPiPi":-1.0361e-02, "PiPiPi":-1.5277e-02},"Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"NonRes":0.0,       "PhiPi":0.0,       "KstK":0.0,      "KPiPi":0.0,         "PiPiPi":0.0}, 
-                                                   "Fixed":True }
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"NonRes":4.3067e-01,   "PhiPi":6.5400e-01,   "KstK":3.7409e-01,  "KPiPi":0.5,         "PiPiPi":0.5}, "Fixed":False}
-    
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" #"ExponentialPlusDoubleCrystalBallWithWidthRatioSharedMean"
-    configdict["DsCombinatorialShape"]["sigma1"]  = {"Run1": {"NonRes":5.2639e+00,  "PhiPi":5.7789e+00,  "KstK":5.5277e+00,  "KPiPi":7.8831e+00,  "PiPiPi":7.8627e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["sigma2"]  = {"Run1": {"NonRes":5.7588e+00,  "PhiPi":5.3142e+00,  "KstK":5.9173e+00,  "KPiPi":6.5553e+00,  "PiPiPi":9.0180e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha1"]  = {"Run1": {"NonRes":-1.1429e+00, "PhiPi":-1.0496e+00, "KstK":-1.1662e+00, "KPiPi":-1.2500e+00, "PiPiPi":-1.1731e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha2"]  = {"Run1": {"NonRes":1.1400e+00,  "PhiPi":1.1819e+00,  "KstK":1.1958e+00,  "KPiPi":1.3706e+00,  "PiPiPi":9.0873e-01},"Fixed":True}
-    configdict["DsCombinatorialShape"]["n1"]      = {"Run1": {"NonRes":1.1892e+01,  "PhiPi":4.9291e+01,  "KstK":1.7661e+01,  "KPiPi":5.0000e+01,  "PiPiPi":8.5777e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["n2"]      = {"Run1": {"NonRes":7.6655e+00,  "PhiPi":4.9162e+00,  "KstK":9.4543e+00,  "KPiPi":3.0195e+00,  "PiPiPi":2.7506e+01}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,        "KstK":0.50,        "KPiPi":0.50,        "PiPiPi":0.50}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["R"]       = {"Run1": {"NonRes":1.00,         "PhiPi":1.5,         "Kstk":1.5,         "KPiPi":1.5,         "PiPiPi":1.5}, "Fixed":False}
-    configdict["DsCombinatorialShape"]["cD"]      = {"Run1": {"NonRes":-5.7520e-03,  "PhiPi":-5.7273e-03, "KstK":-8.3967e-03, "KPiPi":-4.9193e-03, "PiPiPi":-4.5455e-02},"Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"NonRes":0.88620,      "PhiPi":0.37379,     "KstK":0.59093,     "KPiPi":0.5,         "PiPiPi":0.5},"Fixed":False}
-
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK2"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-
-
-    #Bd2Dsh background
-    #shape for BeautyMass, for CharmMass as well as BacPIDK taken by default the same as signal 
-    configdict["Bd2DsPiShape"] = {}
-    configdict["Bd2DsPiShape"]["BeautyMass"] = {}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["type"]    = "ShiftedSignal"
-    configdict["Bd2DsPiShape"]["BeautyMass"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["scale1"]  = {"Run1": {"All": 1.00808721452}, "Fixed":True}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["scale2"]  = {"Run1": {"All": 1.03868673310}, "Fixed":True}
-
-    #
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g1_f2_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.43, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.51, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.43, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.51, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-
-
-    #expected yields                                                                                                                                                       
-    configdict["Yields"] = {}
-    #configdict["Yields"]["Bd2DPi"]          = {"2011": { "NonRes":502.0,   "PhiPi":25.5,    "KstK":366.0,   "KPiPi":0.0,     "PiPiPi":0.0},
-    #                                           "2012": { "NonRes":1116.0,  "PhiPi":61.0,    "KstK":903.0,   "KPiPi":0.0,     "PiPiPi":0.0},  "Fixed":True}
-    configdict["Yields"]["Bd2DPi"]          = {"2011": { "NonRes":28.8,    "PhiPi":2.0,     "KstK":5.8,     "KPiPi":5.6,     "PiPiPi":0.0},
-                                               "2012": { "NonRes":50.1,    "PhiPi":3.8,     "KstK":10.6,    "KPiPi":10.4,    "PiPiPi":0.0},  "Fixed":True}
-    #configdict["Yields"]["Lb2LcPi"]         = {"2011": { "NonRes":215.6,   "PhiPi":39.0,    "KstK":63.0,    "KPiPi":1.4,     "PiPiPi":0.0},
-    #                                           "2012": { "NonRes":560.0,   "PhiPi":92.0,    "KstK":164.0,   "KPiPi":4.6,     "PiPiPi":0.0},  "Fixed":True}
-    configdict["Yields"]["Lb2LcPi"]         = {"2011": { "NonRes":80.0,    "PhiPi":17.7,    "KstK":26.2,    "KPiPi":0.4,     "PiPiPi":0.0},
-                                               "2012": { "NonRes":170.3,   "PhiPi":32.3,    "KstK":53.0,    "KPiPi":1.8,     "PiPiPi":0.0},  "Fixed":True}
-
-    configdict["Yields"]["Bs2DsK"]          = {"2011": { "NonRes":17.4,    "PhiPi":44.5,    "KstK":23.8,    "KPiPi":12.3,    "PiPiPi":25.5},
-                                               "2012": { "NonRes":42.7,    "PhiPi":91.7,    "KstK":60.3,    "KPiPi":22.3,    "PiPiPi":56.8}, "Fixed":True}
-    #configdict["Yields"]["Bs2DsK"]          = {"2011": { "NonRes":46.2,    "PhiPi":69.8,    "KstK":67.6,    "KPiPi":33.3,    "PiPiPi":61.6},
-    #                                           "2012": { "NonRes":118.7,   "PhiPi":171.1,   "KstK":167.0,   "KPiPi":87.8,    "PiPiPi":156.0}, "Fixed":True}
-    configdict["Yields"]["Bs2DsDsstPiRho"]  = {"2011": { "NonRes":100.0,   "PhiPi":100.0,   "KstK":100.0,   "KPiPi":100.0,   "PiPiPi":100.0},
-                                               "2012": { "NonRes":200.0,   "PhiPi":200.0,   "KstK":200.0,   "KPiPi":200.0,   "PiPiPi":200.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]         = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                               "2012": { "NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},"Fixed":False}
-    configdict["Yields"]["Signal"]          = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                               "2012": { "NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},"Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bd2DPi", "Lb2LcPi", "Bs2DsDsstPiRho", "Bs2DsK"] 
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kRed, kBlue-10, kGreen+3]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":2.5}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.7, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.20,0.9], "ScaleYSize":1.2}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitMCFiltered.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitMCFiltered.py
deleted file mode 100644
index ebbf41b972d2dd1a2f70e0a2e2795963638e77b4..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitMCFiltered.py
+++ /dev/null
@@ -1,262 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bs2DsPi"
-    configdict["CharmModes"] = {"KstK","NonRes","PhiPi","KPiPi","PiPiPi"}
-    configdict["Backgrounds"] = ["Bd2DPi","Lb2LcPi","Bs2DsRho","Bs2DsstPi","Bd2DsPi","Bs2DsK"]
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2012"} #,"2012"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                 
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.56, "Up": 0.42}, "2012":{"Down": 0.9912, "Up": 0.9988}}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/Bs2DsPi/config_Bs2DsPi_newBDTG_filteredSignal.txt"
-    #settings for control plots                                                                                                                                                           
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsPi_Nominal", "Extension":"pdf"}
-
-    configdict["GlobalWeight"] = {"2011": {"NonRes" : {"Down":0.776869, "Up":0.564633},
-                                            "PhiPi"  : {"Down":0.789176, "Up":0.572093},
-                                            "KstK"   : {"Down":0.749362, "Up":0.548939},
-                                            "KPiPi"  : {"Down":0.874073, "Up":0.162605},
-                                            "PiPiPi" : {"Down":0.741961, "Up":0.548880}},
-                                   "2012": {"NonRes" : {"Down":0.918942, "Up":0.879671},
-                                            "PhiPi"  : {"Down":0.868050, "Up":0.835603},
-                                            "KstK"   : {"Down":0.885762, "Up":0.859023},
-                                            "KPiPi"  : {"Down":0.838399, "Up":0.413624},
-                                            "PiPiPi" : {"Down":0.931354, "Up":1.000000}}}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFitConsD_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,    5.0     ], "InputName" : "lab1_PIDK"} #-7.0,6.0
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFitConsD_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [ 0.1,    1.0    ], "InputName" : "BDTGResponse_3"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration                                                                                               
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.375,  "p1": 0.982, "average": 0.3688}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4429, "p1": 0.977, "average": 0.4377}
-
-    HLTcut = "&&(lab0_Hlt1TrackAllL0Decision_TOS && (lab0_Hlt2IncPhiDecision_TOS ==1 || lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1))"
-    # additional cuts applied to data sets                                                                                    
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0&&lab1_PIDmu<2"+HLTcut,        
-                                               "MC" : "lab2_TAU>0&&lab1_M<200&&lab1_PIDK !=-1000.0"+HLTcut, "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                              
-    # order of particles: KKPi, KPiPi, PiPiPi                                                                                                         
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-    # additional variables in data sets                                                                                                             
-    #configdict["AdditionalVariables"] = {}
-    #configdict["AdditionalVariables"]["tagOmegaSSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_SS_Kaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecSSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_SS_Kaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSMuon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Muon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSMuon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Muon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSElectron"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Electron_PROB"}
-    #configdict["AdditionalVariables"]["tagDecSSElectron"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Electron_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Kaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Kaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSnnetKaon"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_nnetKaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSnnetKaon"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_nnetKaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSVtxCharge"] =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_VtxCharge_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSVtxCharge"]   =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_VtxCharge_DEC" }
-
-
-    #weighting templates by PID eff/misID                                                                                                                                                 
-    configdict["WeightingMassTemplates"]= { "PIDBachEff":            { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"}, 
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyPionEff_0_mu2"},
-                                            "PIDBachMisID":          { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012"}, 
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyKaonMisID_0_mu2"},
-                                            "PIDChildKaonPionMisID": { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"}, 
-                                                                       "Var":["nTracks","lab3_P"], "HistName":"MyPionMisID_0"}, 
-                                            "PIDChildProtonMisID":   { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"}, 
-                                                                       "Var":["nTracks","lab4_P"], "HistName":"MyProtonMisID_pKm5_KPi5"}, 
-                                            "RatioDataMC":{ "FileLabel": {"2011":"#RatioDataMC 2011 PNTr Filtered", "2012": "#RatioDataMC 2011 PNTr Filtered"}, 
-                                                            "Var":["lab1_P","nTracks"], "HistName":"histRatio"},   
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-
-    #weighting for PID templates                                                                                                                                                          
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacP","nTracks"], "Bins":[30,30] }
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]   = {}
-    configdict["Calibrations"]["2011"]["Proton"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { #"FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                  "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2011", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { #"FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                    "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2011", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-
-
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]   = {}
-    configdict["Calibrations"]["2012"]["Proton"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { #"FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                  "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2012", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { #"FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                    "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2012", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes                                                                                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"NonRes" : 17.4755,   "PhiPi" : 18.3892,   "KstK" : 12.392,    "KPiPi" : 18.0134,   "PiPiPi" : 18.7926},   "Fixed" : True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"NonRes" : 11.5424,   "PhiPi" : 11.4315,   "KstK" : 16.0298,   "KPiPi" : 11.5087,   "PiPiPi" : 11.792},    "Fixed" : True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"NonRes" : -2.18147,  "PhiPi" : -2.18571,  "KstK" : -1.83432,  "KPiPi" : -2.18993,  "PiPiPi" : -2.26617},  "Fixed" : True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"NonRes" : 2.15494,   "PhiPi" : 2.24804,   "KstK" : 1.25656,   "KPiPi" : 2.07243,   "PiPiPi" : 2.06519},   "Fixed" : True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"NonRes" : 2.53609,   "PhiPi" : 2.36718,   "KstK" : 2.82347,   "KPiPi" : 2.67613,   "PiPiPi" : 2.49893},   "Fixed" : True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"NonRes" : 0.518479,  "PhiPi" : 0.410215,  "KstK" : 5.16839,   "KPiPi" : 0.580003,  "PiPiPi" : 0.564315},  "Fixed" : True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.5,         "PhiPi":0.5,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},  "Fixed":True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"NonRes":1.00,        "PhiPi":1.0,          "Kstk":1.0,        "KPiPi":1.0,         "PiPiPi":1.0}, "Fixed":False}
-
-    #Ds signal shapes                                                                                                                                       
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False} 
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"NonRes" : 5.94251,   "PhiPi" : 5.37138,   "KstK" : 5.63019,   "KPiPi" : 6.6889,    "PiPiPi" : 8.51918},  "Fixed" : True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"NonRes" : 5.50472,   "PhiPi" : 5.89377,   "KstK" : 6.17574,   "KPiPi" : 7.48899,   "PiPiPi" : 8.62049},  "Fixed" : True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"NonRes" : -1.1612,   "PhiPi" : -1.1131,   "KstK" : -1.18225,  "KPiPi" : -1.16591,  "PiPiPi" : -1.07096}, "Fixed" : True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"NonRes" : 1.2832,    "PhiPi" : 1.14251,   "KstK" : 1.26344,   "KPiPi" : 1.02116,   "PiPiPi" : 0.978857}, "Fixed" : True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"NonRes" : 16.048,    "PhiPi" : 8.68961,   "KstK" : 11.378,    "KPiPi" : 10.0,       "PiPiPi" : 19.9993},  "Fixed" : True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"NonRes" : 3.68624,   "PhiPi" : 5.8552,    "KstK" : 5.88566,   "KPiPi" : 10.4138,   "PiPiPi" : 5.36778},  "Fixed" : True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,        "KstK":0.50,        "KPiPi":0.50,        "PiPiPi":0.50}, "Fixed":True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"NonRes":1.00,        "PhiPi":1.00,        "KstK":1.00,        "KPiPi":1.00,        "PiPiPi":1.00}, "Fixed":False}
-
-    # combinatorial background                                                                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"NonRes":-3.5211e-02,  "PhiPi":-3.0873e-02,  "KstK":-2.3392e-02, "KPiPi":-1.0361e-02, "PiPiPi":-1.5277e-02},"Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"NonRes":0.0,       "PhiPi":0.0,       "KstK":0.0,      "KPiPi":0.0,         "PiPiPi":0.0}, 
-                                                   "Fixed":True }
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"NonRes":4.3067e-01,   "PhiPi":6.5400e-01,   "KstK":3.7409e-01,  "KPiPi":0.5,         "PiPiPi":0.5}, "Fixed":False}
-    
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" #"ExponentialPlusDoubleCrystalBallWithWidthRatioSharedMean"
-    configdict["DsCombinatorialShape"]["sigma1"]  = {"Run1": {"NonRes":5.2639e+00,  "PhiPi":5.7789e+00,  "KstK":5.5277e+00,  "KPiPi":7.8831e+00,  "PiPiPi":7.8627e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["sigma2"]  = {"Run1": {"NonRes":5.7588e+00,  "PhiPi":5.3142e+00,  "KstK":5.9173e+00,  "KPiPi":6.5553e+00,  "PiPiPi":9.0180e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha1"]  = {"Run1": {"NonRes":-1.1429e+00, "PhiPi":-1.0496e+00, "KstK":-1.1662e+00, "KPiPi":-1.2500e+00, "PiPiPi":-1.1731e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha2"]  = {"Run1": {"NonRes":1.1400e+00,  "PhiPi":1.1819e+00,  "KstK":1.1958e+00,  "KPiPi":1.3706e+00,  "PiPiPi":9.0873e-01},"Fixed":True}
-    configdict["DsCombinatorialShape"]["n1"]      = {"Run1": {"NonRes":1.1892e+01,  "PhiPi":4.9291e+01,  "KstK":1.7661e+01,  "KPiPi":5.0000e+01,  "PiPiPi":8.5777e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["n2"]      = {"Run1": {"NonRes":7.6655e+00,  "PhiPi":4.9162e+00,  "KstK":9.4543e+00,  "KPiPi":3.0195e+00,  "PiPiPi":2.7506e+01}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,        "KstK":0.50,        "KPiPi":0.50,        "PiPiPi":0.50}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["R"]       = {"Run1": {"NonRes":1.00,         "PhiPi":1.5,         "Kstk":1.5,         "KPiPi":1.5,         "PiPiPi":1.5}, "Fixed":False}
-    configdict["DsCombinatorialShape"]["cD"]      = {"Run1": {"NonRes":-5.7520e-03,  "PhiPi":-5.7273e-03, "KstK":-8.3967e-03, "KPiPi":-4.9193e-03, "PiPiPi":-4.5455e-02},"Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"NonRes":0.88620,      "PhiPi":0.37379,     "KstK":0.59093,     "KPiPi":0.5,         "PiPiPi":0.5},"Fixed":False}
-
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK2"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-
-
-    #Bd2Dsh background
-    #shape for BeautyMass, for CharmMass as well as BacPIDK taken by default the same as signal 
-    configdict["Bd2DsPiShape"] = {}
-    configdict["Bd2DsPiShape"]["BeautyMass"] = {}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["type"]    = "ShiftedSignal"
-    configdict["Bd2DsPiShape"]["BeautyMass"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["scale1"]  = {"Run1": {"All": 1.00808721452}, "Fixed":True}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["scale2"]  = {"Run1": {"All": 1.03868673310}, "Fixed":True}
-
-    #
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g1_f2_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.43, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.51, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.43, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.51, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-
-
-    #expected yields                                                                                                                                                       
-    configdict["Yields"] = {}
-    #configdict["Yields"]["Bd2DPi"]          = {"2011": { "NonRes":502.0,   "PhiPi":25.5,    "KstK":366.0,   "KPiPi":0.0,     "PiPiPi":0.0},
-    #                                           "2012": { "NonRes":1116.0,  "PhiPi":61.0,    "KstK":903.0,   "KPiPi":0.0,     "PiPiPi":0.0},  "Fixed":True}
-    #configdict["Yields"]["Bd2DPi"]          = {"2011": { "NonRes":50.4,    "PhiPi":3.5,     "KstK":10.3,    "KPiPi":9.8,     "PiPiPi":0.0},
-    #                                           "2012": { "NonRes":100.5,   "PhiPi":7.8,     "KstK":21.4,    "KPiPi":20.4,    "PiPiPi":0.0},  "Fixed":True}
-    #configdict["Yields"]["Lb2LcPi"]         = {"2011": { "NonRes":215.6,   "PhiPi":39.0,    "KstK":63.0,    "KPiPi":1.4,     "PiPiPi":0.0},
-    #                                           "2012": { "NonRes":560.0,   "PhiPi":92.0,    "KstK":164.0,   "KPiPi":4.6,     "PiPiPi":0.0},  "Fixed":True}
-    #configdict["Yields"]["Lb2LcPi"]         = {"2011": { "NonRes":140.4,   "PhiPi":30.7,    "KstK":46.2,    "KPiPi":0.8,     "PiPiPi":0.0},
-    #                                           "2012": { "NonRes":342.0,   "PhiPi":64.7,    "KstK":108.0,   "KPiPi":3.6,     "PiPiPi":0.0},  "Fixed":True}
-
-    #configdict["Yields"]["Bs2DsK"]          = {"2011": { "NonRes":30.5,    "PhiPi":77.8,    "KstK":41.6,    "KPiPi":21.5,    "PiPiPi":44.6},
-    #                                           "2012": { "NonRes":85.7,    "PhiPi":184.1,   "KstK":121.0,   "KPiPi":44.8,    "PiPiPi":113.8}, "Fixed":True}
-    #configdict["Yields"]["Bs2DsK"]          = {"2011": { "NonRes":46.2,    "PhiPi":69.8,    "KstK":67.6,    "KPiPi":33.3,    "PiPiPi":61.6},
-    #                                           "2012": { "NonRes":118.7,   "PhiPi":171.1,   "KstK":167.0,   "KPiPi":87.8,    "PiPiPi":156.0}, "Fixed":True}
-    #configdict["Yields"]["Bs2DsDsstPiRho"]  = {"2011": { "NonRes":100.0,   "PhiPi":100.0,   "KstK":100.0,   "KPiPi":100.0,   "PiPiPi":100.0},
-    #                                           "2012": { "NonRes":200.0,   "PhiPi":200.0,   "KstK":200.0,   "KPiPi":200.0,   "PiPiPi":200.0}, "Fixed":False}
-    #configdict["Yields"]["CombBkg"]         = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-    #                                           "2012": { "NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},"Fixed":False}
-    configdict["Yields"]["Signal"]          = {"2011": { "NonRes":1000000.0, "PhiPi":1000000.0, "KstK":1000000.0, "KPiPi":1000000.0, "PiPiPi":1000000.0},
-                                               "2012": { "NonRes":2000000.0, "PhiPi":2000000.0, "KstK":2000000.0, "KPiPi":2000000.0, "PiPiPi":2000000.0},"Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bd2DPi", "Lb2LcPi", "Bs2DsDsstPiRho", "Bs2DsK"] 
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kRed, kBlue-10, kGreen+3]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":2.5}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.7, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.20,0.9], "ScaleYSize":1.2}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitP1.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitP1.py
deleted file mode 100644
index b098d4843dd0bf284feca730a6b352e127f7c51e..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitP1.py
+++ /dev/null
@@ -1,246 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bs2DsPi"
-    configdict["CharmModes"] = {"KstK","NonRes","PhiPi","KPiPi","PiPiPi"}
-    configdict["Backgrounds"] = ["Bd2DPi","Lb2LcPi","Bs2DsRho","Bs2DsstPi","Bd2DsPi","Bs2DsK"]
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2011","2012"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                  
-    #configdict["IntegratedLuminosity"] = {"2011": {"Down": 0.59, "Up": 0.44}, "2012":{"Down": 0.9894, "Up": 0.9985}}
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.56, "Up": 0.42}, "2012":{"Down": 0.9912, "Up": 0.9988}}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/Bs2DsPi/config_Bs2DsPi_newBDTG_filteredSignal.txt"
-    #settings for control plots                                                                                                                                                           
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsPi_BsP1", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,    5.0     ], "InputName" : "lab1_PIDK"} #-7.0,6.0
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.1,     1.0     ], "InputName" : "BDTGResponse_3"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration                                                                                               
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.375,  "p1": 0.982, "average": 0.3688}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4429, "p1": 0.977, "average": 0.4377}
-
-    HLTcut = "&&(lab0_Hlt1TrackAllL0Decision_TOS && (lab0_Hlt2IncPhiDecision_TOS ==1 || lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1))"
-    # additional cuts applied to data sets                                                                                    
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab0_P<120000&&lab2_TAU>0&&lab1_PIDmu<2"+HLTcut,        
-                                               "MC" : "lab0_P<120000&&lab2_TAU>0&&lab1_M<200&&lab1_PIDK !=-1000.0"+HLTcut, "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                              
-    # order of particles: KKPi, KPiPi, PiPiPi                                                                                                         
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-    # additional variables in data sets                                                                                                             
-    #configdict["AdditionalVariables"] = {}
-    #configdict["AdditionalVariables"]["tagOmegaSSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_SS_Kaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecSSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_SS_Kaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSMuon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Muon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSMuon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Muon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSElectron"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Electron_PROB"}
-    #configdict["AdditionalVariables"]["tagDecSSElectron"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Electron_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Kaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Kaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSnnetKaon"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_nnetKaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSnnetKaon"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_nnetKaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSVtxCharge"] =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_VtxCharge_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSVtxCharge"]   =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_VtxCharge_DEC" }
-
-
-    #weighting templates by PID eff/misID                                                                                                                                                 
-    configdict["WeightingMassTemplates"]= { "PIDBachEff":            { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyPionEff_0_mu2"},
-                                            "PIDBachMisID":          { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyKaonMisID_0_mu2"},
-                                            "PIDChildKaonPionMisID": { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab3_P"], "HistName":"MyPionMisID_0"},
-                                            "PIDChildProtonMisID":   { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"},
-                                                                       "Var":["nTracks","lab4_P"], "HistName":"MyProtonMisID_pKm5_KPi5"},
-                                            "RatioDataMC":{ "FileLabel": {"2011":"#RatioDataMC 2011 PNTr Filtered", "2012": "#RatioDataMC 2012 PNTr Filtered"},
-                                                            "Var":["lab1_P","nTracks"], "HistName":"histRatio"},
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-
-    #weighting for PID templates                                                                                                                                                          
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacP","nTracks"], "Bins":[30,30] }
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]   = {}
-    configdict["Calibrations"]["2011"]["Proton"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { #"FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1_BDTG3_BsP1.root",
-                                                                  "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3_BsP1.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2011", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacP","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { #"FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1_BDTG3_BsP1.root",
-                                                                    "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3_BsP1.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2011", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacP","nTracks"]}
-    
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]   = {}
-    configdict["Calibrations"]["2012"]["Proton"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { #"FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1_BDTG3_BsP1.root",
-                                                                  "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3_BsP1.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2012", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacP","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { #"FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1_BDTG3_BsP1.root",
-                                                                    "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3_BsP1.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2012", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacP","nTracks"]}
-
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes                                                                                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"NonRes":1.6878e+01,  "PhiPi":1.5228e+01,  "KstK":1.7260e+01,  "KPiPi":1.7791e+01,  "PiPiPi":1.7955e+01},  "Fixed":True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"NonRes":1.1200e+01,  "PhiPi":1.2361e+01,  "KstK":1.1436e+01,  "KPiPi":1.1036e+01,  "PiPiPi":1.1608e+01},  "Fixed":True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"NonRes":-2.0314e+00, "PhiPi":-1.7275e+00, "KstK":-2.2307e+00, "KPiPi":-2.5874e+00, "PiPiPi":-2.2449e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"NonRes":1.6351e+00,  "PhiPi":1.5425e+00,  "KstK":2.1032e+00,  "KPiPi":2.3644e+00,  "PiPiPi":2.0136e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"NonRes":3.6820e+00,  "PhiPi":4.4322e+00,  "KstK":2.8836e+00,  "KPiPi":1.7676e+00,  "PiPiPi":2.7271e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"NonRes":1.5081e+00,  "PhiPi":1.5073e+00,  "KstK":6.1945e-01,  "KPiPi":3.2020e-01,  "PiPiPi":6.7857e-01},  "Fixed":True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.5,         "PhiPi":0.5,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},  "Fixed":True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"NonRes":1.00,        "PhiPi":1.0,          "Kstk":1.0,        "KPiPi":1.0,         "PiPiPi":1.0}, "Fixed":False}
-
-    #Ds signal shapes                                                                                                                                       
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False} 
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"NonRes":5.2639e+00,  "PhiPi":5.7789e+00,  "KstK":5.5277e+00,  "KPiPi":7.8831e+00,  "PiPiPi":7.8627e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"NonRes":5.7588e+00,  "PhiPi":5.3142e+00,  "KstK":5.9173e+00,  "KPiPi":6.5553e+00,  "PiPiPi":9.0180e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"NonRes":-1.1429e+00, "PhiPi":-1.0496e+00, "KstK":-1.1662e+00, "KPiPi":-1.2500e+00, "PiPiPi":-1.1731e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"NonRes":1.1400e+00,  "PhiPi":1.1819e+00,  "KstK":1.1958e+00,  "KPiPi":1.3706e+00,  "PiPiPi":9.0873e-01},"Fixed":True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"NonRes":1.1892e+01,  "PhiPi":4.9291e+01,  "KstK":1.7661e+01,  "KPiPi":5.0000e+01,  "PiPiPi":8.5777e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"NonRes":7.6655e+00,  "PhiPi":4.9162e+00,  "KstK":9.4543e+00,  "KPiPi":3.0195e+00,  "PiPiPi":2.7506e+01}, "Fixed":True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,        "KstK":0.50,        "KPiPi":0.50,        "PiPiPi":0.50}, "Fixed":True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"NonRes":1.00,        "PhiPi":1.00,        "KstK":1.00,        "KPiPi":1.00,        "PiPiPi":1.00}, "Fixed":False}
-
-
-    # combinatorial background                                                                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"NonRes":-3.5211e-02,  "PhiPi":-3.0873e-02,  "KstK":-2.3392e-02, "KPiPi":-1.0361e-02, "PiPiPi":-1.5277e-02},"Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"NonRes":0.0,       "PhiPi":0.0,       "KstK":0.0,      "KPiPi":0.0,         "PiPiPi":0.0}, 
-                                                   "Fixed":True }
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"NonRes":4.3067e-01,   "PhiPi":6.5400e-01,   "KstK":3.7409e-01,  "KPiPi":0.5,         "PiPiPi":0.5}, "Fixed":False}
-    
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" #DoubleCrystalBallWithWidthRatioSharedMean"
-    configdict["DsCombinatorialShape"]["sigma1"]  = {"Run1": {"NonRes":5.2639e+00,  "PhiPi":5.7789e+00,  "KstK":5.5277e+00,  "KPiPi":7.8831e+00,  "PiPiPi":7.8627e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["sigma2"]  = {"Run1": {"NonRes":5.7588e+00,  "PhiPi":5.3142e+00,  "KstK":5.9173e+00,  "KPiPi":6.5553e+00,  "PiPiPi":9.0180e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha1"]  = {"Run1": {"NonRes":-1.1429e+00, "PhiPi":-1.0496e+00, "KstK":-1.1662e+00, "KPiPi":-1.2500e+00, "PiPiPi":-1.1731e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha2"]  = {"Run1": {"NonRes":1.1400e+00,  "PhiPi":1.1819e+00,  "KstK":1.1958e+00,  "KPiPi":1.3706e+00,  "PiPiPi":9.0873e-01},"Fixed":True}
-    configdict["DsCombinatorialShape"]["n1"]      = {"Run1": {"NonRes":1.1892e+01,  "PhiPi":4.9291e+01,  "KstK":1.7661e+01,  "KPiPi":5.0000e+01,  "PiPiPi":8.5777e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["n2"]      = {"Run1": {"NonRes":7.6655e+00,  "PhiPi":4.9162e+00,  "KstK":9.4543e+00,  "KPiPi":3.0195e+00,  "PiPiPi":2.7506e+01}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,        "KstK":0.50,        "KPiPi":0.50,        "PiPiPi":0.50}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["R"]       = {"Run1": {"NonRes":1.00,         "PhiPi":1.5,         "Kstk":1.5,         "KPiPi":1.5,         "PiPiPi":1.5}, "Fixed":False}
-    configdict["DsCombinatorialShape"]["cD"]      = {"Run1": {"NonRes":-5.7520e-03,  "PhiPi":-5.7273e-03, "KstK":-8.3967e-03, "KPiPi":-4.9193e-03, "PiPiPi":-4.5455e-02},"Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"NonRes":0.88620,      "PhiPi":0.37379,     "KstK":0.59093,     "KPiPi":0.5,         "PiPiPi":0.5},"Fixed":False}
-
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK2"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-
-
-    #Bd2Dsh background
-    #shape for BeautyMass, for CharmMass as well as BacPIDK taken by default the same as signal 
-    configdict["Bd2DsPiShape"] = {}
-    configdict["Bd2DsPiShape"]["BeautyMass"] = {}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["type"]    = "ShiftedSignal"
-    configdict["Bd2DsPiShape"]["BeautyMass"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["scale1"]  = {"Run1": {"All": 1.00808721452}, "Fixed":True}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["scale2"]  = {"Run1": {"All": 1.03868673310}, "Fixed":True}
-
-    #
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g1_f2_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.43, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.51, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.43, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.51, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-
-
-    #expected yields                                                                                                                                                       
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bd2DPi"]          = {"2011": { "NonRes":24.9,    "PhiPi":1.8,     "KstK":5.1,     "KPiPi":4.2,     "PiPiPi":0.0},
-                                               "2012": { "NonRes":49.8,    "PhiPi":3.9,     "KstK":10.6,    "KPiPi":10.0,    "PiPiPi":0.0},  "Fixed":True}
-    configdict["Yields"]["Lb2LcPi"]         = {"2011": { "NonRes":70.8,    "PhiPi":15.7,    "KstK":23.3,    "KPiPi":0.4,     "PiPiPi":0.0},
-                                               "2012": { "NonRes":173.0,   "PhiPi":32.9,    "KstK":54.6,    "KPiPi":1.8,     "PiPiPi":0.0},  "Fixed":True}
-    configdict["Yields"]["Bs2DsK"]          = {"2011": { "NonRes":14.5,    "PhiPi":37.1,    "KstK":19.9,    "KPiPi":10.3,    "PiPiPi":21.3},
-                                               "2012": { "NonRes":40.9,    "PhiPi":87.9,    "KstK":57.8,    "KPiPi":21.4,    "PiPiPi":54.3}, "Fixed":True}
-    configdict["Yields"]["Bs2DsDsstPiRho"]  = {"2011": { "NonRes":100.0,   "PhiPi":100.0,   "KstK":100.0,   "KPiPi":100.0,   "PiPiPi":100.0},
-                                               "2012": { "NonRes":200.0,   "PhiPi":200.0,   "KstK":200.0,   "KPiPi":200.0,   "PiPiPi":200.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]         = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                               "2012": { "NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},"Fixed":False}
-    configdict["Yields"]["Signal"]          = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                               "2012": { "NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},"Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bd2DPi", "Lb2LcPi", "Bs2DsDsstPiRho", "Bs2DsK"] 
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kRed, kBlue-10, kGreen+3]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":2.5}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.7, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.20,0.9], "ScaleYSize":1.2}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitP2.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitP2.py
deleted file mode 100644
index ab189d5b15169cedbc784f58e380b516398ce45f..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitP2.py
+++ /dev/null
@@ -1,254 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bs2DsPi"
-    configdict["CharmModes"] = {"KstK","NonRes","PhiPi","KPiPi","PiPiPi"}
-    configdict["Backgrounds"] = ["Bd2DPi","Lb2LcPi","Bs2DsRho","Bs2DsstPi","Bd2DsPi","Bs2DsK"]
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2011","2012"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                  
-    #configdict["IntegratedLuminosity"] = {"2011": {"Down": 0.59, "Up": 0.44}, "2012":{"Down": 0.9894, "Up": 0.9985}}
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.56, "Up": 0.42}, "2012":{"Down": 0.9912, "Up": 0.9988}}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/Bs2DsPi/config_Bs2DsPi_newBDTG_filteredSignal.txt"
-    #settings for control plots                                                                                                                                                           
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsPi_BsP2", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,    5.0     ], "InputName" : "lab1_PIDK"} #-7.0,6.0
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.1,     1.0     ], "InputName" : "BDTGResponse_3"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration                                                                                               
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.375,  "p1": 0.982, "average": 0.3688}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4429, "p1": 0.977, "average": 0.4377}
-
-    HLTcut = "&&(lab0_Hlt1TrackAllL0Decision_TOS && (lab0_Hlt2IncPhiDecision_TOS ==1 || lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1))"
-    # additional cuts applied to data sets                                                                                    
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab0_P>=120000&&lab2_TAU>0&&lab1_PIDmu<2"+HLTcut,        
-                                               "MC" : "lab0_P>=120000&&lab2_TAU>0&&lab1_M<200&&lab1_PIDK !=-1000.0"+HLTcut, "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                              
-    # order of particles: KKPi, KPiPi, PiPiPi                                                                                                         
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-    # additional variables in data sets                                                                                                             
-    #configdict["AdditionalVariables"] = {}
-    #configdict["AdditionalVariables"]["tagOmegaSSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_SS_Kaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecSSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_SS_Kaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSMuon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Muon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSMuon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Muon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSElectron"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Electron_PROB"}
-    #configdict["AdditionalVariables"]["tagDecSSElectron"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Electron_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Kaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Kaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSnnetKaon"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_nnetKaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSnnetKaon"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_nnetKaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSVtxCharge"] =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_VtxCharge_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSVtxCharge"]   =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_VtxCharge_DEC" }
-
-
-    #weighting templates by PID eff/misID                                                                                                                                                 
-    configdict["WeightingMassTemplates"]= { "PIDBachEff":            { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyPionEff_0_mu2"},
-                                            "PIDBachMisID":          { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012"},
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyKaonMisID_0_mu2"},
-                                            "PIDChildKaonPionMisID": { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                                       "Var":["nTracks","lab3_P"], "HistName":"MyPionMisID_0"},
-                                            "PIDChildProtonMisID":   { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"},
-                                                                       "Var":["nTracks","lab4_P"], "HistName":"MyProtonMisID_pKm5_KPi5"},
-                                            "RatioDataMC":{ "FileLabel": {"2011":"#RatioDataMC 2011 PNTr Filtered", "2012": "#RatioDataMC 2012 PNTr Filtered"},
-                                                            "Var":["lab1_P","nTracks"], "HistName":"histRatio"},
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-
-
-    #weighting for PID templates                                                                                                                                                          
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacP","nTracks"], "Bins":[30,30] }
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]   = {}
-    configdict["Calibrations"]["2011"]["Proton"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { #"FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1_BDTG3_BsP2.root",
-                                                                  "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3_BsP2.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2011", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacP","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { #"FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1_BDTG3_BsP2.root",
-                                                                    "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3_BsP2.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2011", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacP","nTracks"]}
-
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]   = {}
-    configdict["Calibrations"]["2012"]["Proton"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { #"FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1_BDTG3_BsP2.root",
-                                                                  "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3_BsP2.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2012", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacP","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { #"FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1_BDTG3_BsP2.root",
-                                                                    "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3_BsP2.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2012", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacP","nTracks"]}
-
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes                                                                                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"NonRes":1.6878e+01,  "PhiPi":1.5228e+01,  "KstK":1.7260e+01,  "KPiPi":1.7791e+01,  "PiPiPi":1.7955e+01},  "Fixed":True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"NonRes":1.1200e+01,  "PhiPi":1.2361e+01,  "KstK":1.1436e+01,  "KPiPi":1.1036e+01,  "PiPiPi":1.1608e+01},  "Fixed":True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"NonRes":-2.0314e+00, "PhiPi":-1.7275e+00, "KstK":-2.2307e+00, "KPiPi":-2.5874e+00, "PiPiPi":-2.2449e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"NonRes":1.6351e+00,  "PhiPi":1.5425e+00,  "KstK":2.1032e+00,  "KPiPi":2.3644e+00,  "PiPiPi":2.0136e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"NonRes":3.6820e+00,  "PhiPi":4.4322e+00,  "KstK":2.8836e+00,  "KPiPi":1.7676e+00,  "PiPiPi":2.7271e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"NonRes":1.5081e+00,  "PhiPi":1.5073e+00,  "KstK":6.1945e-01,  "KPiPi":3.2020e-01,  "PiPiPi":6.7857e-01},  "Fixed":True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.5,         "PhiPi":0.5,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},  "Fixed":True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"NonRes":1.00,        "PhiPi":1.0,          "Kstk":1.0,        "KPiPi":1.0,         "PiPiPi":1.0}, "Fixed":False}
-
-    #Ds signal shapes                                                                                                                                       
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False} 
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"NonRes":5.2639e+00,  "PhiPi":5.7789e+00,  "KstK":5.5277e+00,  "KPiPi":7.8831e+00,  "PiPiPi":7.8627e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"NonRes":5.7588e+00,  "PhiPi":5.3142e+00,  "KstK":5.9173e+00,  "KPiPi":6.5553e+00,  "PiPiPi":9.0180e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"NonRes":-1.1429e+00, "PhiPi":-1.0496e+00, "KstK":-1.1662e+00, "KPiPi":-1.2500e+00, "PiPiPi":-1.1731e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"NonRes":1.1400e+00,  "PhiPi":1.1819e+00,  "KstK":1.1958e+00,  "KPiPi":1.3706e+00,  "PiPiPi":9.0873e-01},"Fixed":True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"NonRes":1.1892e+01,  "PhiPi":4.9291e+01,  "KstK":1.7661e+01,  "KPiPi":5.0000e+01,  "PiPiPi":8.5777e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"NonRes":7.6655e+00,  "PhiPi":4.9162e+00,  "KstK":9.4543e+00,  "KPiPi":3.0195e+00,  "PiPiPi":2.7506e+01}, "Fixed":True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,        "KstK":0.50,        "KPiPi":0.50,        "PiPiPi":0.50}, "Fixed":True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"NonRes":1.00,        "PhiPi":1.00,        "KstK":1.00,        "KPiPi":1.00,        "PiPiPi":1.00}, "Fixed":False}
-
-
-    # combinatorial background                                                                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"NonRes":-3.5211e-02,  "PhiPi":-3.0873e-02,  "KstK":-2.3392e-02, "KPiPi":-1.0361e-02, "PiPiPi":-1.5277e-02},"Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"NonRes":0.0,       "PhiPi":0.0,       "KstK":0.0,      "KPiPi":0.0,         "PiPiPi":0.0}, 
-                                                   "Fixed":True }
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"NonRes":4.3067e-01,   "PhiPi":6.5400e-01,   "KstK":3.7409e-01,  "KPiPi":0.5,         "PiPiPi":0.5}, "Fixed":False}
-    
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" #DoubleCrystalBallWithWidthRatioSharedMean"
-    configdict["DsCombinatorialShape"]["sigma1"]  = {"Run1": {"NonRes":5.2639e+00,  "PhiPi":5.7789e+00,  "KstK":5.5277e+00,  "KPiPi":7.8831e+00,  "PiPiPi":7.8627e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["sigma2"]  = {"Run1": {"NonRes":5.7588e+00,  "PhiPi":5.3142e+00,  "KstK":5.9173e+00,  "KPiPi":6.5553e+00,  "PiPiPi":9.0180e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha1"]  = {"Run1": {"NonRes":-1.1429e+00, "PhiPi":-1.0496e+00, "KstK":-1.1662e+00, "KPiPi":-1.2500e+00, "PiPiPi":-1.1731e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha2"]  = {"Run1": {"NonRes":1.1400e+00,  "PhiPi":1.1819e+00,  "KstK":1.1958e+00,  "KPiPi":1.3706e+00,  "PiPiPi":9.0873e-01},"Fixed":True}
-    configdict["DsCombinatorialShape"]["n1"]      = {"Run1": {"NonRes":1.1892e+01,  "PhiPi":4.9291e+01,  "KstK":1.7661e+01,  "KPiPi":5.0000e+01,  "PiPiPi":8.5777e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["n2"]      = {"Run1": {"NonRes":7.6655e+00,  "PhiPi":4.9162e+00,  "KstK":9.4543e+00,  "KPiPi":3.0195e+00,  "PiPiPi":2.7506e+01}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,        "KstK":0.50,        "KPiPi":0.50,        "PiPiPi":0.50}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["R"]       = {"Run1": {"NonRes":1.00,         "PhiPi":1.5,         "Kstk":1.5,         "KPiPi":1.5,         "PiPiPi":1.5}, "Fixed":False}
-    configdict["DsCombinatorialShape"]["cD"]      = {"Run1": {"NonRes":-5.7520e-03,  "PhiPi":-5.7273e-03, "KstK":-8.3967e-03, "KPiPi":-4.9193e-03, "PiPiPi":-4.5455e-02},"Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"NonRes":0.88620,      "PhiPi":0.37379,     "KstK":0.59093,     "KPiPi":0.5,         "PiPiPi":0.5},"Fixed":False}
-
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK2"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-
-
-    #Bd2Dsh background
-    #shape for BeautyMass, for CharmMass as well as BacPIDK taken by default the same as signal 
-    configdict["Bd2DsPiShape"] = {}
-    configdict["Bd2DsPiShape"]["BeautyMass"] = {}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["type"]    = "ShiftedSignal"
-    configdict["Bd2DsPiShape"]["BeautyMass"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["scale1"]  = {"Run1": {"All": 1.00808721452}, "Fixed":True}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["scale2"]  = {"Run1": {"All": 1.03868673310}, "Fixed":True}
-
-
-    #
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g1_f2_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.43, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.51, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.43, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.51, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-
-
-    #expected yields                                                                                                                                                       
-    configdict["Yields"] = {}
-    #configdict["Yields"]["Bd2DPi"]          = {"2011": { "NonRes":263.8,   "PhiPi":13.4,    "KstK":192.3,   "KPiPi":0.0,     "PiPiPi":0.0},
-    #                                           "2012": { "NonRes":586.4,   "PhiPi":32.0,    "KstK":474.5,   "KPiPi":0.0,     "PiPiPi":0.0},  "Fixed":True}
-    #configdict["Yields"]["Lb2LcPi"]         = {"2011": { "NonRes":128.2,   "PhiPi":20.2,    "KstK":38.9,    "KPiPi":0.8,     "PiPiPi":0.0},
-    #                                           "2012": { "NonRes":305.2,   "PhiPi":49.8,    "KstK":91.2,    "KPiPi":2.6,     "PiPiPi":0.0},  "Fixed":True}
-    #configdict["Yields"]["Bs2DsK"]          = {"2011": { "NonRes":22.4,    "PhiPi":33.4,    "KstK":32.8,    "KPiPi":16.7,    "PiPiPi":30.2},
-    #                                           "2012": { "NonRes":59.4,    "PhiPi":86.0,    "KstK":83.9,    "KPiPi":44.32,   "PiPiPi":79.8}, "Fixed":True}
-    configdict["Yields"]["Bd2DPi"]          = {"2011": { "NonRes":25.4,    "PhiPi":1.7,     "KstK":5.9,     "KPiPi":5.6,     "PiPiPi":0.0},
-                                               "2012": { "NonRes":50.6,    "PhiPi":3.9,     "KstK":10.8,    "KPiPi":10.0,     "PiPiPi":0.0},  "Fixed":True}
-    configdict["Yields"]["Lb2LcPi"]         = {"2011": { "NonRes":69.2,    "PhiPi":15.3,    "KstK":22.7,    "KPiPi":0.4,     "PiPiPi":0.0},
-                                               "2012": { "NonRes":169.0,   "PhiPi":32.1,    "KstK":53.4,    "KPiPi":1.8,     "PiPiPi":0.0},  "Fixed":True}
-    configdict["Yields"]["Bs2DsK"]          = {"2011": { "NonRes":15.9,    "PhiPi":40.6,    "KstK":21.8,    "KPiPi":11.2,    "PiPiPi":23.3},
-                                               "2012": { "NonRes":44.8,    "PhiPi":96.2,    "KstK":63.3,    "KPiPi":23.4,    "PiPiPi":79.8}, "Fixed":True}
-    configdict["Yields"]["Bs2DsDsstPiRho"]  = {"2011": { "NonRes":100.0,   "PhiPi":100.0,   "KstK":100.0,   "KPiPi":100.0,   "PiPiPi":59.5},
-                                               "2012": { "NonRes":200.0,   "PhiPi":200.0,   "KstK":200.0,   "KPiPi":200.0,   "PiPiPi":200.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]         = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                               "2012": { "NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},"Fixed":False}
-    configdict["Yields"]["Signal"]          = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                               "2012": { "NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},"Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bd2DPi", "Lb2LcPi", "Bs2DsDsstPiRho", "Bs2DsK"] 
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kRed, kBlue-10, kGreen+3]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":2.5}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.7, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.20,0.9], "ScaleYSize":1.2}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitSideband.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitSideband.py
deleted file mode 100644
index 5190e10a6adc8569140f2cfd1eb94e3db967f9ff..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitSideband.py
+++ /dev/null
@@ -1,6 +0,0 @@
-def getconfig() :
-
-    from Bs2DsPiConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [6000,    7000    ], "InputName" : "lab0_MassFitConsD_M"}
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitToys.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitToys.py
deleted file mode 100644
index c5bafc1a170ed83c97ba66fe78192056a7da2449..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitToys.py
+++ /dev/null
@@ -1,237 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Toys"] = True 
-
-    configdict["Decay"] = "Bs2DsPi"
-    configdict["CharmModes"] = {"KstK","NonRes","PhiPi","KPiPi","PiPiPi"}
-    configdict["Backgrounds"] = ["Bd2DPi","Lb2LcPi","Bs2DsRho","Bs2DsstPi","Bd2DsPi","Bs2DsK"]
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2011","2012"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                 
-    #configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.56, "Up": 0.42}, "2012":{"Down": 0.9912, "Up": 0.9988}}
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.50, "Up": 0.50}, "2012":{"Down": 1.000, "Up": 1.000}}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/Bs2DsPi/config_Bs2DsPi.txt"
-    #settings for control plots                                                                                                                                                           
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsPi_Nominal", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,    5.0     ], "InputName" : "lab1_PIDK"} #-7.0,6.0
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.0,     1.0     ], "InputName" : "BDTGResponse_2"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration                                                                                               
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.375,  "p1": 0.982, "average": 0.3688}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4429, "p1": 0.977, "average": 0.4377}
-
-    HLTcut = "&&(lab0_Hlt1TrackAllL0Decision_TOS && (lab0_Hlt2IncPhiDecision_TOS ==1 || lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1))"
-    # additional cuts applied to data sets                                                                                    
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0&&lab1_PIDmu<2"+HLTcut,        
-                                               "MC" : "lab2_TAU>0&&lab1_M<200&&lab1_PIDK !=-1000.0"+HLTcut, "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                              
-    # order of particles: KKPi, KPiPi, PiPiPi                                                                                                         
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-    # additional variables in data sets                                                                                                             
-    configdict["AdditionalVariables"] = {}
-    configdict["AdditionalVariables"]["TrueID"]      =  { "Range" : [ 0.0, 1000.0 ], "InputName" : "TrueID"}
-    #configdict["AdditionalVariables"]["tagDecSSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_SS_Kaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSMuon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Muon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSMuon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Muon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSElectron"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Electron_PROB"}
-    #configdict["AdditionalVariables"]["tagDecSSElectron"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Electron_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Kaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Kaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSnnetKaon"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_nnetKaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSnnetKaon"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_nnetKaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSVtxCharge"] =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_VtxCharge_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSVtxCharge"]   =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_VtxCharge_DEC" }
-
-
-    #weighting templates by PID eff/misID                                                                                                                                                 
-    configdict["WeightingMassTemplates"]= { "PIDBachEff":            { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"}, 
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyPionEff_0_mu2"},
-                                            "PIDBachMisID":          { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012"}, 
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyKaonMisID_0_mu2"},
-                                            "PIDChildKaonPionMisID": { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"}, 
-                                                                       "Var":["nTracks","lab3_P"], "HistName":"MyPionMisID_0"}, 
-                                            "PIDChildProtonMisID":   { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"}, 
-                                                                       "Var":["nTracks","lab4_P"], "HistName":"MyProtonMisID_pKm5_KPi5"}, 
-                                            "RatioDataMC":{ "FileLabel": {"2011":"#RatioDataMC 2011 PNTr", "2012": "#RatioDataMC 2012 PNTr"}, 
-                                                            "Var":["lab1_P","nTracks"], "HistName":"histRatio"},   
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-
-    #weighting for PID templates                                                                                                                                                          
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacP","nTracks"], "Bins":[30,30] }
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]   = {}
-    configdict["Calibrations"]["2011"]["Proton"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2011", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2011", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]   = {}
-    configdict["Calibrations"]["2012"]["Proton"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1.root",
-                                                                     "WorkName":"workspace", "DataName":"dataCombBkg_up_2012", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2012", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes                                                                                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"NonRes":1.6878e+01,  "PhiPi":1.5228e+01,  "KstK":1.7260e+01,  "KPiPi":1.7791e+01,  "PiPiPi":1.7955e+01},  "Fixed":True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"NonRes":1.1200e+01,  "PhiPi":1.2361e+01,  "KstK":1.1436e+01,  "KPiPi":1.1036e+01,  "PiPiPi":1.1608e+01},  "Fixed":True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"NonRes":-2.0314e+00, "PhiPi":-1.7275e+00, "KstK":-2.2307e+00, "KPiPi":-2.5874e+00, "PiPiPi":-2.2449e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"NonRes":1.6351e+00,  "PhiPi":1.5425e+00,  "KstK":2.1032e+00,  "KPiPi":2.3644e+00,  "PiPiPi":2.0136e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"NonRes":3.6820e+00,  "PhiPi":4.4322e+00,  "KstK":2.8836e+00,  "KPiPi":1.7676e+00,  "PiPiPi":2.7271e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"NonRes":1.5081e+00,  "PhiPi":1.5073e+00,  "KstK":6.1945e-01,  "KPiPi":3.2020e-01,  "PiPiPi":6.7857e-01},  "Fixed":True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.5,         "PhiPi":0.5,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},  "Fixed":True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"NonRes":1.00,        "PhiPi":1.0,          "Kstk":1.0,        "KPiPi":1.0,         "PiPiPi":1.0}, "Fixed":False}
-
-    #Ds signal shapes                                                                                                                                       
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False} 
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"NonRes":5.2639e+00,  "PhiPi":5.7789e+00,  "KstK":5.5277e+00,  "KPiPi":7.8831e+00,  "PiPiPi":7.8627e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"NonRes":5.7588e+00,  "PhiPi":5.3142e+00,  "KstK":5.9173e+00,  "KPiPi":6.5553e+00,  "PiPiPi":9.0180e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"NonRes":-1.1429e+00, "PhiPi":-1.0496e+00, "KstK":-1.1662e+00, "KPiPi":-1.2500e+00, "PiPiPi":-1.1731e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"NonRes":1.1400e+00,  "PhiPi":1.1819e+00,  "KstK":1.1958e+00,  "KPiPi":1.3706e+00,  "PiPiPi":9.0873e-01},"Fixed":True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"NonRes":1.1892e+01,  "PhiPi":4.9291e+01,  "KstK":1.7661e+01,  "KPiPi":5.0000e+01,  "PiPiPi":8.5777e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"NonRes":7.6655e+00,  "PhiPi":4.9162e+00,  "KstK":9.4543e+00,  "KPiPi":3.0195e+00,  "PiPiPi":2.7506e+01}, "Fixed":True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,        "KstK":0.50,        "KPiPi":0.50,        "PiPiPi":0.50}, "Fixed":True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"NonRes":1.00,        "PhiPi":1.00,        "KstK":1.00,        "KPiPi":1.00,        "PiPiPi":1.00}, "Fixed":False}
-
-    # combinatorial background                                                                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"NonRes":-3.5211e-02,  "PhiPi":-3.0873e-02,  "KstK":-2.3392e-02, "KPiPi":-1.0361e-02, "PiPiPi":-1.5277e-02},"Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"NonRes":0.0,       "PhiPi":0.0,       "KstK":0.0,      "KPiPi":0.0,         "PiPiPi":0.0}, 
-                                                   "Fixed":True }
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"NonRes":4.3067e-01,   "PhiPi":6.5400e-01,   "KstK":3.7409e-01,  "KPiPi":0.5,         "PiPiPi":0.5}, "Fixed":False}
-    
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" #"ExponentialPlusDoubleCrystalBallWithWidthRatioSharedMean"
-    configdict["DsCombinatorialShape"]["sigma1"]  = {"Run1": {"NonRes":5.2639e+00,  "PhiPi":5.7789e+00,  "KstK":5.5277e+00,  "KPiPi":7.8831e+00,  "PiPiPi":7.8627e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["sigma2"]  = {"Run1": {"NonRes":5.7588e+00,  "PhiPi":5.3142e+00,  "KstK":5.9173e+00,  "KPiPi":6.5553e+00,  "PiPiPi":9.0180e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha1"]  = {"Run1": {"NonRes":-1.1429e+00, "PhiPi":-1.0496e+00, "KstK":-1.1662e+00, "KPiPi":-1.2500e+00, "PiPiPi":-1.1731e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha2"]  = {"Run1": {"NonRes":1.1400e+00,  "PhiPi":1.1819e+00,  "KstK":1.1958e+00,  "KPiPi":1.3706e+00,  "PiPiPi":9.0873e-01},"Fixed":True}
-    configdict["DsCombinatorialShape"]["n1"]      = {"Run1": {"NonRes":1.1892e+01,  "PhiPi":4.9291e+01,  "KstK":1.7661e+01,  "KPiPi":5.0000e+01,  "PiPiPi":8.5777e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["n2"]      = {"Run1": {"NonRes":7.6655e+00,  "PhiPi":4.9162e+00,  "KstK":9.4543e+00,  "KPiPi":3.0195e+00,  "PiPiPi":2.7506e+01}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,        "KstK":0.50,        "KPiPi":0.50,        "PiPiPi":0.50}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["R"]       = {"Run1": {"NonRes":1.00,         "PhiPi":1.5,         "Kstk":1.5,         "KPiPi":1.5,         "PiPiPi":1.5}, "Fixed":False}
-    configdict["DsCombinatorialShape"]["cD"]      = {"Run1": {"NonRes":-5.0833e-03,  "PhiPi":-1.1455e-02, "KstK":-1.2313e-02, "KPiPi":-4.1421e-03, "PiPiPi":-7.5455e-03},"Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"NonRes":0.88620,      "PhiPi":0.37379,     "KstK":0.59093,     "KPiPi":0.5,         "PiPiPi":0.5},"Fixed":False}
-
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK2"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-
-
-    #Bd2Dsh background
-    #shape for BeautyMass, for CharmMass as well as BacPIDK taken by default the same as signal 
-    configdict["Bd2DsPiShape"] = {}
-    configdict["Bd2DsPiShape"]["BeautyMass"] = {}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["type"]    = "ShiftedSignal"
-    configdict["Bd2DsPiShape"]["BeautyMass"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["scale1"]  = {"Run1": {"All": 1.00808721452}, "Fixed":True}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["scale2"]  = {"Run1": {"All": 1.03868673310}, "Fixed":True}
-
-    #
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g1_f2_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-
-
-    #expected yields                                                                                                                                                       
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bd2DPi"]          = {"2011": { "NonRes":50.4,    "PhiPi":3.5,     "KstK":10.3,    "KPiPi":9.8,     "PiPiPi":0.0},
-                                               "2012": { "NonRes":100.5,   "PhiPi":7.8,     "KstK":21.4,    "KPiPi":20.4,    "PiPiPi":0.0},  "Fixed":True}
-    configdict["Yields"]["Lb2LcPi"]         = {"2011": { "NonRes":140.4,   "PhiPi":30.7,    "KstK":46.2,    "KPiPi":0.8,     "PiPiPi":0.0},
-                                               "2012": { "NonRes":342.0,   "PhiPi":64.7,    "KstK":108.0,   "KPiPi":3.6,     "PiPiPi":0.0},  "Fixed":True}
-    configdict["Yields"]["Bs2DsK"]          = {"2011": { "NonRes":30.5,    "PhiPi":77.8,    "KstK":41.6,    "KPiPi":21.5,    "PiPiPi":44.6},
-                                               "2012": { "NonRes":85.7,    "PhiPi":184.1,   "KstK":121.0,   "KPiPi":44.8,    "PiPiPi":113.8}, "Fixed":True}
-    configdict["Yields"]["Bs2DsDsstPiRho"]  = {"2011": { "NonRes":100.0,   "PhiPi":100.0,   "KstK":100.0,   "KPiPi":100.0,   "PiPiPi":100.0},
-                                               "2012": { "NonRes":200.0,   "PhiPi":200.0,   "KstK":200.0,   "KPiPi":200.0,   "PiPiPi":200.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]         = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                               "2012": { "NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},"Fixed":False}
-    configdict["Yields"]["Signal"]          = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                               "2012": { "NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},"Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig","CombBkg", "Bd2DPi", "Lb2LcPi", "Bs2DsDsstPiRho", "Bs2DsK"] 
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kRed, kBlue-10, kGreen+3]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":2.5}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.7, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.20,0.9], "ScaleYSize":1.2}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitUp.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitUp.py
deleted file mode 100644
index e4dee7687c2ca09f59a9be28ce45d5b6c8a803d5..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitUp.py
+++ /dev/null
@@ -1,251 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bs2DsPi"
-    configdict["CharmModes"] = {"KstK","NonRes","PhiPi","KPiPi","PiPiPi"}
-    configdict["Backgrounds"] = ["Bd2DPi","Lb2LcPi","Bs2DsRho","Bs2DsstPi","Bd2DsPi","Bs2DsK"]
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2011","2012"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                 
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.56, "Up": 0.42}, "2012":{"Down": 0.9912, "Up": 0.9988}}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/Bs2DsPi/config_Bs2DsPi_newBDTG.txt"
-    #settings for control plots                                                                                                                                                           
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsPi_Nominal", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,    5.0     ], "InputName" : "lab1_PIDK"} #-7.0,6.0
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [ 0.2,    1.0     ], "InputName" : "BDTGResponse_3"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration                                                                                               
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.375,  "p1": 0.982, "average": 0.3688}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4429, "p1": 0.977, "average": 0.4377}
-
-    HLTcut = "&&(lab0_Hlt1TrackAllL0Decision_TOS && (lab0_Hlt2IncPhiDecision_TOS ==1 || lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1))"
-    # additional cuts applied to data sets                                                                                    
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0&&lab1_PIDmu<2"+HLTcut,        
-                                               "MC" : "lab2_TAU>0&&lab1_M<200&&lab1_PIDK !=-1000.0"+HLTcut, "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                              
-    # order of particles: KKPi, KPiPi, PiPiPi                                                                                                         
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-    # additional variables in data sets                                                                                                             
-    #configdict["AdditionalVariables"] = {}
-    #configdict["AdditionalVariables"]["tagOmegaSSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_SS_Kaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecSSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_SS_Kaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSMuon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Muon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSMuon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Muon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSElectron"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Electron_PROB"}
-    #configdict["AdditionalVariables"]["tagDecSSElectron"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Electron_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSKaon"]      =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_Kaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSKaon"]        =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_Kaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSnnetKaon"]  =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_OS_nnetKaon_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSnnetKaon"]    =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_OS_nnetKaon_DEC"}
-    #configdict["AdditionalVariables"]["tagOmegaOSVtxCharge"] =  { "Range" : [ -3.0, 1,0 ], "InputName" : "lab0_VtxCharge_PROB"}
-    #configdict["AdditionalVariables"]["tagDecOSVtxCharge"]   =  { "Range" : [ -2.0, 2,0 ], "InputName" : "lab0_VtxCharge_DEC" }
-
-
-    #weighting templates by PID eff/misID                                                                                                                                                 
-    configdict["WeightingMassTemplates"]= { "PIDBachEff":            { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"}, 
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyPionEff_0_mu2"},
-                                            "PIDBachMisID":          { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012"}, 
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyKaonMisID_0_mu2"},
-                                            "PIDChildKaonPionMisID": { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"}, 
-                                                                       "Var":["nTracks","lab3_P"], "HistName":"MyPionMisID_0"}, 
-                                            "PIDChildProtonMisID":   { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"}, 
-                                                                       "Var":["nTracks","lab4_P"], "HistName":"MyProtonMisID_pKm5_KPi5"}, 
-                                            "RatioDataMC":{ "FileLabel": {"2011":"#RatioDataMC 2011 PNTr", "2012": "#RatioDataMC 2011 PNTr"}, 
-                                                            "Var":["lab1_P","nTracks"], "HistName":"histRatio"},   
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-
-    #weighting for PID templates                                                                                                                                                          
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[30,30] }
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]   = {}
-    configdict["Calibrations"]["2011"]["Proton"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Proton"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { #"FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                  "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2011", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { #"FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                    "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2011", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-
-
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]   = {}
-    configdict["Calibrations"]["2012"]["Proton"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_P_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Proton"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_P_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { #"FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                  "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2012", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { #"FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                    "FileName":"/afs/cern.ch/user/a/adudziak/roofit/MDFitter/3fb/PIDK_combo/workspaces/work_Comb_DsPi_Run1_BDTG3.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2012", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["BacPT","nTracks"]}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes                                                                                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"NonRes" : 17.4755,   "PhiPi" : 18.3892,   "KstK" : 12.392,    "KPiPi" : 18.0134,   "PiPiPi" : 18.7926},   "Fixed" : True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"NonRes" : 11.5424,   "PhiPi" : 11.4315,   "KstK" : 16.0298,   "KPiPi" : 11.5087,   "PiPiPi" : 11.792},    "Fixed" : True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"NonRes" : -2.18147,  "PhiPi" : -2.18571,  "KstK" : -1.83432,  "KPiPi" : -2.18993,  "PiPiPi" : -2.26617},  "Fixed" : True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"NonRes" : 2.15494,   "PhiPi" : 2.24804,   "KstK" : 1.25656,   "KPiPi" : 2.07243,   "PiPiPi" : 2.06519},   "Fixed" : True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"NonRes" : 2.53609,   "PhiPi" : 2.36718,   "KstK" : 2.82347,   "KPiPi" : 2.67613,   "PiPiPi" : 2.49893},   "Fixed" : True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"NonRes" : 0.518479,  "PhiPi" : 0.410215,  "KstK" : 5.16839,   "KPiPi" : 0.580003,  "PiPiPi" : 0.564315},  "Fixed" : True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.5,         "PhiPi":0.5,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},  "Fixed":True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"NonRes":1.00,        "PhiPi":1.0,          "Kstk":1.0,        "KPiPi":1.0,         "PiPiPi":1.0}, "Fixed":False}
-
-    #Ds signal shapes                                                                                                                                       
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False} 
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"NonRes" : 5.94251,   "PhiPi" : 5.37138,   "KstK" : 5.63019,   "KPiPi" : 6.6889,    "PiPiPi" : 8.51918},  "Fixed" : True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"NonRes" : 5.50472,   "PhiPi" : 5.89377,   "KstK" : 6.17574,   "KPiPi" : 7.48899,   "PiPiPi" : 8.62049},  "Fixed" : True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"NonRes" : -1.1612,   "PhiPi" : -1.1131,   "KstK" : -1.18225,  "KPiPi" : -1.16591,  "PiPiPi" : -1.07096}, "Fixed" : True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"NonRes" : 1.2832,    "PhiPi" : 1.14251,   "KstK" : 1.26344,   "KPiPi" : 1.02116,   "PiPiPi" : 0.978857}, "Fixed" : True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"NonRes" : 16.048,    "PhiPi" : 8.68961,   "KstK" : 11.378,    "KPiPi" : 10.0,       "PiPiPi" : 19.9993},  "Fixed" : True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"NonRes" : 3.68624,   "PhiPi" : 5.8552,    "KstK" : 5.88566,   "KPiPi" : 10.4138,   "PiPiPi" : 5.36778},  "Fixed" : True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,        "KstK":0.50,        "KPiPi":0.50,        "PiPiPi":0.50}, "Fixed":True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"NonRes":1.00,        "PhiPi":1.00,        "KstK":1.00,        "KPiPi":1.00,        "PiPiPi":1.00}, "Fixed":False}
-
-    # combinatorial background                                                                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"NonRes":-3.5211e-02,  "PhiPi":-3.0873e-02,  "KstK":-2.3392e-02, "KPiPi":-1.0361e-02, "PiPiPi":-1.5277e-02},"Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"NonRes":0.0,       "PhiPi":0.0,       "KstK":0.0,      "KPiPi":0.0,         "PiPiPi":0.0}, 
-                                                   "Fixed":True }
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"NonRes":4.3067e-01,   "PhiPi":6.5400e-01,   "KstK":3.7409e-01,  "KPiPi":0.5,         "PiPiPi":0.5}, "Fixed":False}
-    
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" #"ExponentialPlusDoubleCrystalBallWithWidthRatioSharedMean"
-    configdict["DsCombinatorialShape"]["sigma1"]  = {"Run1": {"NonRes":5.2639e+00,  "PhiPi":5.7789e+00,  "KstK":5.5277e+00,  "KPiPi":7.8831e+00,  "PiPiPi":7.8627e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["sigma2"]  = {"Run1": {"NonRes":5.7588e+00,  "PhiPi":5.3142e+00,  "KstK":5.9173e+00,  "KPiPi":6.5553e+00,  "PiPiPi":9.0180e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha1"]  = {"Run1": {"NonRes":-1.1429e+00, "PhiPi":-1.0496e+00, "KstK":-1.1662e+00, "KPiPi":-1.2500e+00, "PiPiPi":-1.1731e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha2"]  = {"Run1": {"NonRes":1.1400e+00,  "PhiPi":1.1819e+00,  "KstK":1.1958e+00,  "KPiPi":1.3706e+00,  "PiPiPi":9.0873e-01},"Fixed":True}
-    configdict["DsCombinatorialShape"]["n1"]      = {"Run1": {"NonRes":1.1892e+01,  "PhiPi":4.9291e+01,  "KstK":1.7661e+01,  "KPiPi":5.0000e+01,  "PiPiPi":8.5777e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["n2"]      = {"Run1": {"NonRes":7.6655e+00,  "PhiPi":4.9162e+00,  "KstK":9.4543e+00,  "KPiPi":3.0195e+00,  "PiPiPi":2.7506e+01}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["frac"]    = {"Run1": {"NonRes":0.50,        "PhiPi":0.50,        "KstK":0.50,        "KPiPi":0.50,        "PiPiPi":0.50}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["R"]       = {"Run1": {"NonRes":1.00,         "PhiPi":1.5,         "Kstk":1.5,         "KPiPi":1.5,         "PiPiPi":1.5}, "Fixed":False}
-    configdict["DsCombinatorialShape"]["cD"]      = {"Run1": {"NonRes":-5.7520e-03,  "PhiPi":-5.7273e-03, "KstK":-8.3967e-03, "KPiPi":-4.9193e-03, "PiPiPi":-4.5455e-02},"Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"NonRes":0.88620,      "PhiPi":0.37379,     "KstK":0.59093,     "KPiPi":0.5,         "PiPiPi":0.5},"Fixed":False}
-
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK2"]   = { "Run1":{"NonRes":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-
-
-    #Bd2Dsh background
-    #shape for BeautyMass, for CharmMass as well as BacPIDK taken by default the same as signal 
-    configdict["Bd2DsPiShape"] = {}
-    configdict["Bd2DsPiShape"]["BeautyMass"] = {}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["type"]    = "ShiftedSignal"
-    configdict["Bd2DsPiShape"]["BeautyMass"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["scale1"]  = {"Run1": {"All": 1.00808721452}, "Fixed":True}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["scale2"]  = {"Run1": {"All": 1.03868673310}, "Fixed":True}
-
-    #
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g1_f2_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.43, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.51, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Signal_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2011"] = {"Run1":{"All":{"Both":{"CentralValue":0.43, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_2012"] = {"Run1":{"All":{"Both":{"CentralValue":0.51, "Range":[0.2,0.7]}}}, "Fixed":True}
-    configdict["AdditionalParameters"]["lumRatio_Comb_run1"] = {"Run1":{"All":{"Both":{"CentralValue":0.31, "Range":[0.0,1.0]}}}, "Fixed":True}
-
-
-    #expected yields                                                                                                                                                       
-    configdict["Yields"] = {}
-    #configdict["Yields"]["Bd2DPi"]          = {"2011": { "NonRes":502.0,   "PhiPi":25.5,    "KstK":366.0,   "KPiPi":0.0,     "PiPiPi":0.0},
-    #                                           "2012": { "NonRes":1116.0,  "PhiPi":61.0,    "KstK":903.0,   "KPiPi":0.0,     "PiPiPi":0.0},  "Fixed":True}
-    configdict["Yields"]["Bd2DPi"]          = {"2011": { "NonRes":21.6,    "PhiPi":1.5,     "KstK":4.4,     "KPiPi":4.2,     "PiPiPi":0.0},
-                                               "2012": { "NonRes":50.4,    "PhiPi":3.9,     "KstK":10.7,    "KPiPi":10.7,    "PiPiPi":0.0},  "Fixed":True}
-    #configdict["Yields"]["Lb2LcPi"]         = {"2011": { "NonRes":215.6,   "PhiPi":39.0,    "KstK":63.0,    "KPiPi":1.4,     "PiPiPi":0.0},
-    #                                           "2012": { "NonRes":560.0,   "PhiPi":92.0,    "KstK":164.0,   "KPiPi":4.6,     "PiPiPi":0.0},  "Fixed":True}
-    configdict["Yields"]["Lb2LcPi"]         = {"2011": { "NonRes":60.0,    "PhiPi":13.3,    "KstK":19.7,    "KPiPi":0.3,     "PiPiPi":0.0},
-                                               "2012": { "NonRes":170.0,   "PhiPi":32.6,    "KstK":54.7,    "KPiPi":1.8,     "PiPiPi":0.0},  "Fixed":True}
-
-    configdict["Yields"]["Bs2DsK"]          = {"2011": { "NonRes":13.1,    "PhiPi":44.5,    "KstK":23.8,    "KPiPi":12.3,    "PiPiPi":25.5},
-                                               "2012": { "NonRes":43.7,    "PhiPi":91.7,    "KstK":60.3,    "KPiPi":22.3,    "PiPiPi":56.7}, "Fixed":True}
-    #configdict["Yields"]["Bs2DsK"]          = {"2011": { "NonRes":46.2,    "PhiPi":69.8,    "KstK":67.6,    "KPiPi":33.3,    "PiPiPi":61.6},
-    #                                           "2012": { "NonRes":118.7,   "PhiPi":171.1,   "KstK":167.0,   "KPiPi":87.8,    "PiPiPi":156.0}, "Fixed":True}
-    configdict["Yields"]["Bs2DsDsstPiRho"]  = {"2011": { "NonRes":100.0,   "PhiPi":100.0,   "KstK":100.0,   "KPiPi":100.0,   "PiPiPi":100.0},
-                                               "2012": { "NonRes":200.0,   "PhiPi":200.0,   "KstK":200.0,   "KPiPi":200.0,   "PiPiPi":200.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]         = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                               "2012": { "NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},"Fixed":False}
-    configdict["Yields"]["Signal"]          = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                               "2012": { "NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},"Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bd2DPi", "Lb2LcPi", "Bs2DsDsstPiRho", "Bs2DsK"] 
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kRed, kBlue-10, kGreen+3]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":2.5}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.7, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.20,0.9], "ScaleYSize":1.2}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForTaggingCalibration.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForTaggingCalibration.py
deleted file mode 100644
index 548518e2e1b23d14ba3f306ecbc8328a4002b8e1..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForTaggingCalibration.py
+++ /dev/null
@@ -1,90 +0,0 @@
-def getconfig() :
-
-    from Bs2DsPiConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    
-    #configdict["Gammas"]        =  0.661   # in ps^{-1}
-    #configdict["DeltaGammas"]   =  -0.105
-    #configdict["DeltaMs"]       = 17.768   # in ps^{-1}
-    configdict["Gammas"]        =  0.6643   # in ps^{-1}
-    configdict["DeltaGammas"]   =  -0.083
-    configdict["DeltaMs"]       = 17.757   # in ps^{-1}
-    configdict["TagEffSig"]     = 0.403
-    configdict["TagOmegaSig"]   = 0.391
-    configdict["StrongPhase"]   = 20. / 180. * pi
-    configdict["WeakPhase"]     = 70./180.*pi
-    configdict["ModLf"]         = 0.372
-    configdict["CPlimit"]       = {"upper":4.0, "lower":-4.0} 
-
-    configdict["TaggingCalibration"] = {}
-    configdict["ConstrainsForTaggingCalib"] = False
-    configdict["FixAcceptance"] = True
-    
-    
-#    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4429, "p1": 0.977, "average": 0.4377, 
-#                                              "tagEff":0.387, "aTagEff":0.0, "use":True, }
-#    configdict["TaggingCalibration"]["OS"] = {"p0": 0.375,  "p1": 0.982, "average": 0.3688, 
-#                                              "tagEff":0.4772, "aTagEff":0.0, "use":False}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3898, "dp0": 0.0, "p1": 0.9907, "dp1": 0.0,
-                                              "average": 0.369798, "tagEff":0.374, "aTagEff":0.0, "use":True}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4459, "dp0": 0.0, "p1": 0.9617, "dp1": 0.0,
-                                              "average": 0.43744, "tagEff":0.636, "aTagEff":0.0, "use":False}
-    
-
-
-
-    configdict["Acceptance"] = { "knots": [0.50, 1.0,  1.5, 2.0, 3.0, 12.0],
-                                 "values": [3.774e-01,5.793e-01,7.752e-01,1.0043e+00,1.0937e+00,1.1872] }
-    #NOMINAL
-    configdict["Resolution"] = { "scaleFactor":{"p0":0.010262, "p1":1.28, "p2":0.0},
-    #SINGLE GAUSSIAN
-    #configdict["Resolution"] = { "scaleFactor":{"p0":0.0, "p1":1.772, "p2":0.0}, 
-    #ALTERNATIVE APPROACH
-    #configdict["Resolution"] = { "scaleFactor":{"p0":0.000568, "p1":1.243, "p2":0.0}, 
-                                 
-                                 "meanBias":0.0,
-                                 "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                            "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                 "templates": { "fileName":"../data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root",
-                                                "workName":"workspace",
-                                                "templateName":"TimeErrorPdf_Bs2DsPi"} }
-
-    
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas_Bs2DsPi')
-    configdict["constParams"].append('deltaGammas_Bs2DsPi')
-    configdict["constParams"].append('C_Bs2DsPi')
-    configdict["constParams"].append('Cbar_Bs2DsPi')
-    configdict["constParams"].append('S_Bs2DsPi')
-    configdict["constParams"].append('Sbar_Bs2DsPi')
-    configdict["constParams"].append('D_Bs2DsPi')
-    configdict["constParams"].append('Dbar_Bs2DsPi')
-    if configdict["FixAcceptance"] == True:
-        configdict["constParams"].append('var1')
-        configdict["constParams"].append('var2')
-        configdict["constParams"].append('var3')
-        configdict["constParams"].append('var4')
-        configdict["constParams"].append('var5')
-        configdict["constParams"].append('var6')
-    configdict["constParams"].append('aTagEff_OS')
-    configdict["constParams"].append('aTagEff_SS')
-    #configdict["constParams"].append('tagEff_OS')
-    #configdict["constParams"].append('tagEff_SS')
-    #configdict["constParams"].append('p0_OS')
-    #configdict["constParams"].append('p0_SS')
-    #configdict["constParams"].append('p1_OS')
-    #configdict["constParams"].append('p1_SS')
-    configdict["constParams"].append('dp0_OS')
-    configdict["constParams"].append('dp0_SS')
-    configdict["constParams"].append('dp1_OS')
-    configdict["constParams"].append('dp1_SS')
-    configdict["constParams"].append('average_OS')
-    configdict["constParams"].append('average_SS')
-
-    configdict["constParams"].append('DeltaMs_Bs2DsPi')
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForToyGenerator.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForToyGenerator.py
deleted file mode 100644
index e063cd57a4ea870101396465a9257b3b4548ae44..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/Bs2DsPiConfigForToyGenerator.py
+++ /dev/null
@@ -1,858 +0,0 @@
-from __future__ import print_function
-from __future__ import division
-from past.utils import old_div
-def getconfig() :
-
-    configdict = {}
-
-    ############################################################
-    #List of observables for all the PDFs.
-    #The content of this dictionary determines the observables
-    #to generate for and how may taggers are present.
-    ############################################################
-    
-    configdict["Observables"] = {}
-    configdict["Observables"] = {"BeautyMass":    {"Type"  : "RooRealVar",
-                                                   "Title" : "B mass (MeV/c^2)",
-                                                   "Range" : [5300, 5800]},
-                                 "CharmMass":     {"Type" : "RooRealVar",
-                                                   "Title" : "D mass (MeV/c^2)",
-                                                   "Range" : [1930, 2015]},
-                                 "BacPIDK":       {"Type"  : "RooRealVar",
-                                                   "Title": "log(fabs(PIDK))",
-                                                   "Range": [ -7.0, 5.0]},
-                                 "TrueID":        {"Type" : "RooRealVar",
-                                                   "Title" : "True component ID",
-                                                   "Range" : [0.0,1000.0]}}
-
-    '''
-                                 "BeautyTime":    {"Type" : "RooRealVar",
-                                                   "Title" : "B decay time (ps)",
-                                                   "Range" : [0.4, 15.0]},
-                                 "BeautyTimeErr": {"Type" : "RooRealVar",
-                                                   "Title" : "B decay time error (ps)",
-                                                   "Range" : [0.01, 0.1]},
-                                 "BacCharge":     {"Type"  : "RooCategory",
-                                                   "Title" : "Bachelor charge",
-                                                   "Categories": { "h+" : +1,
-                                                                   "h-" : -1}},
-                                 "MistagOS":      {"Type" : "RooRealVar",
-                                                   "Title" : "#eta_{OS}",
-                                                   "Range" : [0.0,0.5]},
-                                 "MistagSS":      {"Type" : "RooRealVar",
-                                                   "Title" : "#eta_{SS}",
-                                                   "Range" : [0.0,0.5]},
-                                                   "TagDecOS":      {"Type"  : "RooCategory",
-                                                   "Title" : "q_{t}^{OS}",
-                                                   "Categories": { "B+"       : +1,
-                                                                   "Untagged" : 0,
-                                                                   "B-"       : -1}},
-                                 "TagDecSS":      {"Type"  : "RooCategory",
-                                                   "Title" : "q_{t}^{SS}",
-                                                   "Categories": { "B+"       : +1,
-                                                                   "Untagged" : 0,
-                                                                   "B-"       : -1}}
-                                 }
-    '''
-    
-    ############################################################ 
-    #List of mass hypotheses for bachelor
-    #The content of this dictionary determines how many
-    #bachelor PID bins the final dataset is splitted into
-    ############################################################
-    
-    configdict["Hypothesys"] = ["Bs2DsPi"]
-
-    ############################################################
-    #Signal decay, Charm decay mode and year of data taking
-    #Splitting per magnet polarity not implemented, at the moment
-    ############################################################
-
-    configdict["Decay"] = "Bs2DsPi"
-    configdict["CharmModes"] = ["NonRes","PhiPi","KstK","KPiPi","PiPiPi"]
-    configdict["Years"] = ["2011","2012"]
-    configdict["MergedYears"] = True
-    
-
-    ############################################################
-    #For PIDK shapes we need also polarities
-    ############################################################
-    configdict["Polarity"] = ["Up","Down"]
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.50, "Up": 0.50}, "2012":{"Down": 1.000, "Up": 1.000}}
-    configdict["FractionsLuminosity"] = {"2011": (old_div(configdict["IntegratedLuminosity"]["2011"]["Up"],(configdict["IntegratedLuminosity"]["2011"]["Up"] + configdict["IntegratedLuminosity"]["2011"]["Down"]))),
-                                         "2012": (old_div(configdict["IntegratedLuminosity"]["2012"]["Up"],(configdict["IntegratedLuminosity"]["2012"]["Up"] + configdict["IntegratedLuminosity"]["2012"]["Down"])))}
-    
-    lum2011 =  configdict["IntegratedLuminosity"]["2011"]["Up"] + configdict["IntegratedLuminosity"]["2011"]["Down"] 
-    lum2012 =  configdict["IntegratedLuminosity"]["2012"]["Up"] + configdict["IntegratedLuminosity"]["2012"]["Down"]
-    fracRun1 = old_div(lum2011,(lum2011 + lum2012)) 
-    print(fracRun1)
-    
-    
-    configdict["WorkspaceToRead"] = {"File":"/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/2nd/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                     "Workspace" : "workspace"}
-    ############################################################ 
-    #List of components with yields to generate.
-    #The content of this dictionary determines, for each
-    #PID bin and year, how many PDF components are generated.
-    #If there is only signal, a TTree ready for sFit is
-    #generated directly, without need for doing a (useless)
-    #mass fit.
-    ############################################################
-    
-    #configdict["Components"] = {}
-    #configdict["Components"]["Signal"] = {}
-    configdict["Components"] = {"Signal":        {"Bs2DsPi": {"2011": {"NonRes": [15900*fracRun1], "PhiPi":[34100*fracRun1], 
-                                                                       "KstK"  : [25500*fracRun1], "KPiPi":[5600*fracRun1],  "PiPiPi":[15026*fracRun1] },
-                                                              "2012": {"NonRes": [15900*(1.0-fracRun1)], "PhiPi":[34100*(1.0-fracRun1)], 
-                                                                       "KstK"  : [25500*(1.0-fracRun1)], "KPiPi":[5600*(1.0-fracRun1)],  "PiPiPi":[15026*(1.0-fracRun1)] }}},
-                                "Combinatorial": {"Bs2DsPi": {"2011": {"NonRes": [8400*fracRun1],  "PhiPi":[2800*fracRun1],  
-                                                                       "KstK"  : [3400*fracRun1],  "KPiPi":[2300*fracRun1],  "PiPiPi":[5800*fracRun1] },
-                                                              "2012": {"NonRes": [8400*(1.0-fracRun1)],  "PhiPi":[2800*(1.0-fracRun1)],  
-                                                                       "KstK"  : [3400*(1.0-fracRun1)],  "KPiPi":[2300*(1.0-fracRun1)],  "PiPiPi":[5800*(1.0-fracRun1)] }}},
-                                "Bd2DPi":        {"Bs2DsPi": {"2011": {"NonRes": [150*fracRun1],  "PhiPi":[10*fracRun1],  
-                                                                       "KstK"  : [30*fracRun1],   "KPiPi":[30.0*fracRun1],   "PiPiPi":[0.0*fracRun1] },
-                                                              "2012": {"NonRes": [150*(1.0-fracRun1)],  "PhiPi":[10.0*(1.0-fracRun1)],  
-                                                                       "KstK"  : [30*(1.0-fracRun1)],   "KPiPi":[30.0*(1.0-fracRun1)],   "PiPiPi":[0.0*(1.0-fracRun1)] }}},
-                                "Lb2LcPi":       {"Bs2DsPi": {"2011": {"NonRes": [480.0*fracRun1], "PhiPi":[95*fracRun1],   
-                                                                       "KstK"  : [150*fracRun1],   "KPiPi":[5*fracRun1],   "PiPiPi":[0.0*fracRun1] },
-                                                              "2012": {"NonRes": [480.0*(1.0-fracRun1)], "PhiPi":[95*(1.0-fracRun1)],   
-                                                                       "KstK"  : [150*(1.0 - fracRun1)],  "KPiPi" : [5*(1.0-fracRun1)],   "PiPiPi":[0.0*(1.0-fracRun1)] }}}, 
-                                "Bs2DsK":        {"Bs2DsPi": {"2011": {"NonRes": [116.0*fracRun1], "PhiPi":[261.*fracRun1], 
-                                                                       "KstK"  : [163*fracRun1], "KPiPi":[66*fracRun1], "PiPiPi":[158*fracRun1] },
-                                                              "2012": {"NonRes": [116.0*(1.0-fracRun1)], "PhiPi":[261.*(1.0-fracRun1)], 
-                                                                       "KstK"  : [163*(1.0-fracRun1)], "KPiPi":[66*(1.0-fracRun1)], "PiPiPi":[158*(1.0-fracRun1)] }}},
-                                "Bd2DsPi":       {"Bs2DsPi": {"2011": {"NonRes": [100*fracRun1],    "PhiPi":[220*fracRun1],    
-                                                                       "KstK"  : [170*fracRun1],   "KPiPi":[40*fracRun1],    "PiPiPi":[100*fracRun1] },
-                                                              "2012": {"NonRes": [100*(1.0-fracRun1)],    "PhiPi":[220*(1.0-fracRun1)],    
-                                                                       "KstK"  : [170*(1.0-fracRun1)],    "KPiPi":[40*(1.0-fracRun1)],    "PiPiPi":[100*(1.0-fracRun1)] }}}}
-    
-                                                                       
-    ############################################################
-    #"Code" to identify the True ID for each component
-    ############################################################
-
-    configdict["TrueID"] = {}
-    configdict["TrueID"] = {"Signal"        : 100,
-                            "Combinatorial" : 200,
-                            "Bd2DPi"        : 300,
-                            "Lb2LcPi"       : 400,
-                            "Bs2DsK"        : 500,
-                            "Bd2DsPi"       : 600}
-
-    configdict["CombinedYields"] = { "Signal":["Signal"],
-                                     "Combinatorial":["Combinatorial"],
-                                     "Bs2DsDsstPiRho":["Bd2DsPi"]}
- 
-
-    ############################################################
-    #List of PDFs for "time-independent" observables
-    #Dictionary structure: observable->component->bachelor hypo->year->D mode
-    ############################################################
-
-    ############################################################
-    #                      Signal                               
-    ############################################################
-
-    ############################################################
-    configdict["PDFList"] = {}
-    configdict["PDFList"]["BeautyMass"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"] = {} 
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"] =  {"Type" : "DoubleCrystalBall",
-                                                                                   "mean":[5367.51], "sigma1":[1.6878e+01], "sigma2": [1.1200e+01], "alpha1": [-2.0314e+00],
-                                                                                   "alpha2":[1.6351e+00], "n1":[3.6820e+00], "n2":[1.5081e+00], "frac":[0.5]}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["KstK"] =  {"Type" : "DoubleCrystalBall",
-                                                                                   "mean":[5367.51], "sigma1":[1.7260e+01], "sigma2": [1.1436e+01], "alpha1": [-2.2307e+00],
-                                                                                   "alpha2":[2.1032e+00], "n1":[2.8836e+00], "n2":[6.1945e-01],"frac":[0.5]}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                  "mean":[5367.51], "sigma1":[1.5228e+01], "sigma2": [1.2361e+01], "alpha1": [-1.7275e+00],
-                                                                                  "alpha2":[1.5425e+00], "n1":[4.4322e+00], "n2":[1.5073e+00],"frac":[0.5]}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                  "mean":[5367.51], "sigma1":[1.7791e+01], "sigma2": [1.1036e+01], "alpha1": [-2.5874e+00],
-                                                                                  "alpha2":[2.3644e+00], "n1":[1.7676e+00], "n2":[3.2020e-01],"frac":[0.5]}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                   "mean":[5367.51], "sigma1":[1.7955e+01], "sigma2": [1.1608e+01], "alpha1": [-2.2449e+00],
-                                                                                   "alpha2":[2.0136e+00], "n1":[2.7271e+00], "n2":[6.7857e-01],"frac":[0.5]}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"] =  {"Type" : "DoubleCrystalBall",
-                                                                                   "mean":[5367.51], "sigma1":[1.6878e+01], "sigma2": [1.1200e+01], "alpha1": [-2.0314e+00],
-                                                                                   "alpha2":[1.6351e+00], "n1":[3.6820e+00], "n2":[1.5081e+00],"frac":[0.5]}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["KstK"] =  {"Type" : "DoubleCrystalBall",
-                                                                                 "mean":[5367.51], "sigma1":[1.7260e+01], "sigma2": [1.1436e+01], "alpha1": [-2.2307e+00],
-                                                                                 "alpha2":[2.1032e+00], "n1":[2.8836e+00], "n2":[6.1945e-01],"frac":[0.5]}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                  "mean":[5367.51], "sigma1":[1.5228e+01], "sigma2": [1.2361e+01], "alpha1": [-1.7275e+00],
-                                                                                  "alpha2":[1.5425e+00], "n1":[4.4322e+00], "n2":[1.5073e+00],"frac":[0.5]}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                  "mean":[5367.51], "sigma1":[1.7791e+01], "sigma2": [1.1036e+01], "alpha1": [-2.5874e+00],
-                                                                                  "alpha2":[2.3644e+00], "n1":[1.7676e+00], "n2":[3.2020e-01],"frac":[0.5]}
-    configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                   "mean":[5367.51], "sigma1":[1.7955e+01], "sigma2": [1.1608e+01], "alpha1": [-2.2449e+00],
-                                                                                   "alpha2":[2.0136e+00], "n1":[2.7271e+00], "n2":[6.7857e-01],"frac":[0.5]}
-    
-    ############################################################### 
-    configdict["PDFList"]["CharmMass"] = {}
-    configdict["PDFList"]["CharmMass"]["Signal"] = {}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"] = {}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"] = {}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"] =  {"Type" : "DoubleCrystalBall",
-                                                                                   "mean":[1968.49], "sigma1":[5.2639e+00], "sigma2": [5.7588e+00], "alpha1": [-1.1429e+00],
-                                                                                   "alpha2":[1.1400e+00], "n1":[1.1892e+01], "n2":[7.6655e+00], "frac":[0.5]}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                 "mean":[1968.49], "sigma1":[5.7789e+00], "sigma2": [5.3142e+00], "alpha1": [-1.0496e+00],
-                                                                                 "alpha2":[1.1819e+00], "n1":[4.9291e+01], "n2":[4.9162e+00], "frac":[0.5]}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KstK"] =  {"Type" : "DoubleCrystalBall",
-                                                                                "mean":[1968.49], "sigma1":[5.5277e+00], "sigma2": [5.9173e+00], "alpha1": [-1.1662e+00],
-                                                                                "alpha2":[1.1958e+00], "n1":[1.7661e+01], "n2":[9.4543e+00], "frac":[0.5]}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                 "mean":[1968.49], "sigma1":[7.8831e+00], "sigma2": [6.5553e+00], "alpha1": [-1.2500e+00],
-                                                                                 "alpha2":[1.3706e+00], "n1":[5.0000e+01], "n2":[3.0195e+00], "frac":[0.5]}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                  "mean":[1968.49], "sigma1":[7.8627e+00], "sigma2": [9.0180e+00], "alpha1": [-1.1731e+00],
-                                                                                  "alpha2":[9.0873e-01], "n1":[8.5777e+00], "n2":[2.7506e+01], "frac":[0.5]}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"] = {}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"] =  {"Type" : "DoubleCrystalBall",
-                                                                                   "mean":[1968.49], "sigma1":[5.2639e+00], "sigma2": [5.7588e+00], "alpha1": [-1.1429e+00],
-                                                                                   "alpha2":[1.1400e+00], "n1":[1.1892e+01], "n2":[7.6655e+00], "frac":[0.5]}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                 "mean":[1968.49], "sigma1":[5.7789e+00], "sigma2": [5.3142e+00], "alpha1": [-1.0496e+00],
-                                                                                 "alpha2":[1.1819e+00], "n1":[4.9291e+01], "n2":[4.9162e+00], "frac":[0.5]}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KstK"] =  {"Type" : "DoubleCrystalBall",
-                                                                                "mean":[1968.49], "sigma1":[5.5277e+00], "sigma2": [5.9173e+00], "alpha1": [-1.1662e+00],
-                                                                                "alpha2":[1.1958e+00], "n1":[1.7661e+01], "n2":[9.4543e+00], "frac":[0.5]}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                 "mean":[1968.49], "sigma1":[7.8831e+00], "sigma2": [6.5553e+00], "alpha1": [-1.2500e+00],
-                                                                                 "alpha2":[1.3706e+00], "n1":[5.0000e+01], "n2":[3.0195e+00], "frac":[0.5]}
-    configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"] =  {"Type" : "DoubleCrystalBall",
-                                                                                  "mean":[1968.49], "sigma1":[7.8627e+00], "sigma2": [9.0180e+00], "alpha1": [-1.1731e+00],
-                                                                                  "alpha2":[9.0873e-01], "n1":[8.5777e+00], "n2":[2.7506e+01], "frac":[0.5]}
-    ###############################################################
-    configdict["PDFList"]["BacPIDK"] = {}
-    configdict["PDFList"]["BacPIDK"]["Signal"] = {}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"] = {}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2011"] = {}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",  
-                                                                               "Name": {"Up": "PIDKShape_Bs2DsPi_up_nonres_2011", "Down":"PIDKShape_Bs2DsPi_down_nonres_2011"}}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": {"Up": "PIDKShape_Bs2DsPi_up_phipi_2011", "Down":"PIDKShape_Bs2DsPi_down_phipi_2011"}}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2011"]["KstK"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": {"Up": "PIDKShape_Bs2DsPi_up_kstk_2011", "Down":"PIDKShape_Bs2DsPi_down_kstk_2011"}}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": {"Up": "PIDKShape_Bs2DsPi_up_kpipi_2011", "Down":"PIDKShape_Bs2DsPi_down_kpipi_2011"}}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": {"Up": "PIDKShape_Bs2DsPi_up_pipipi_2011", "Down":"PIDKShape_Bs2DsPi_down_pipipi_2011"}}
-
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2012"] = {}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": {"Up": "PIDKShape_Bs2DsPi_up_nonres_2012", "Down":"PIDKShape_Bs2DsPi_down_nonres_2012"}}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": {"Up": "PIDKShape_Bs2DsPi_up_phipi_2012", "Down":"PIDKShape_Bs2DsPi_down_phipi_2012"}}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2012"]["KstK"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": {"Up": "PIDKShape_Bs2DsPi_up_kstk_2012", "Down":"PIDKShape_Bs2DsPi_down_kstk_2012"}}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": {"Up": "PIDKShape_Bs2DsPi_up_kpipi_2012", "Down":"PIDKShape_Bs2DsPi_down_kpipi_2012"}}
-    configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": {"Up": "PIDKShape_Bs2DsPi_up_pipipi_2012", "Down":"PIDKShape_Bs2DsPi_down_pipipi_2012"}}
-
-    ############################################################    
-    #                      Combinatorial      
-    ############################################################   
-
-    ############################################################
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"] = {}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsPi"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsPi"]["2011"]["NonRes"] = {"Type":"DoubleExponential", "cB1":[-4.8467e-03], "cB2":[0.0], "frac":[7.9999e-01]}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsPi"]["2011"]["PhiPi"]  = {"Type":"DoubleExponential", "cB1":[-1.2569e-02], "cB2":[0.0], "frac":[7.5491e-01]}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsPi"]["2011"]["KstK"]   = {"Type":"DoubleExponential", "cB1":[-4.2236e-03], "cB2":[0.0], "frac":[8.7769e-01]}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsPi"]["2011"]["KPiPi"]  = {"Type":"DoubleExponential", "cB1":[-8.3869e-03], "cB2":[0.0], "frac":[4.9568e-01]}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsPi"]["2011"]["PiPiPi"] = {"Type":"DoubleExponential", "cB1":[-6.2744e-03], "cB2":[0.0], "frac":[5.9887e-01]}
-
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsPi"]["2012"] = {}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsPi"]["2012"]["NonRes"] = {"Type":"DoubleExponential", "cB1":[-4.8467e-03], "cB2":[0.0], "frac":[7.9999e-01]}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsPi"]["2012"]["PhiPi"]  = {"Type":"DoubleExponential", "cB1":[-1.2569e-02], "cB2":[0.0], "frac":[7.5491e-01]}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsPi"]["2012"]["KstK"]   = {"Type":"DoubleExponential", "cB1":[-4.2236e-03], "cB2":[0.0], "frac":[8.7769e-01]}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsPi"]["2012"]["KPiPi"]  = {"Type":"DoubleExponential", "cB1":[-8.3869e-03], "cB2":[0.0], "frac":[4.9568e-01]}
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"]["Bs2DsPi"]["2012"]["PiPiPi"] = {"Type":"DoubleExponential", "cB1":[-6.2744e-03], "cB2":[0.0], "frac":[5.9887e-01]}
-
-    ############################################################
-    
-    configdict["PDFList"]["CharmMass"]["Combinatorial"] = {}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsPi"] = {}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsPi"]["2011"] = {}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsPi"]["2011"]["NonRes"] = {"Type":"ExponentialPlusDoubleCrystalBall",
-                                                                                        "mean"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"]["mean"][0]], 
-                                                                                        "sigma1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"]["sigma1"][0]], 
-                                                                                        "sigma2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"]["sigma2"][0]], 
-                                                                                        "alpha1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"]["alpha1"][0]],
-                                                                                        "alpha2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"]["alpha2"][0]], 
-                                                                                        "n1"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"]["n1"][0]], 
-                                                                                        "n2"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"]["n2"][0]], 
-                                                                                        "frac"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"]["frac"][0]],
-                                                                                        "cB"    : [-5.0833e-03], "fracD":[4.9069e-01]}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsPi"]["2011"]["PhiPi"] = {"Type":"ExponentialPlusDoubleCrystalBall",
-                                                                                       "mean"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"]["mean"][0]],
-                                                                                       "sigma1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"]["sigma1"][0]],
-                                                                                       "sigma2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"]["sigma2"][0]],
-                                                                                       "alpha1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"]["alpha1"][0]],
-                                                                                       "alpha2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"]["alpha2"][0]],
-                                                                                       "n1"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"]["n1"][0]],
-                                                                                       "n2"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"]["n2"][0]],
-                                                                                       "frac"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"]["frac"][0]],
-                                                                                      "cB"     : [-1.1455e-02], "fracD":[7.6156e-01]}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsPi"]["2011"]["KstK"] = {"Type":"ExponentialPlusDoubleCrystalBall",
-                                                                                      "mean"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KstK"]["mean"][0]],
-                                                                                      "sigma1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KstK"]["sigma1"][0]],
-                                                                                      "sigma2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KstK"]["sigma2"][0]],
-                                                                                      "alpha1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KstK"]["alpha1"][0]],
-                                                                                      "alpha2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KstK"]["alpha2"][0]],
-                                                                                      "n1"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KstK"]["n1"][0]],
-                                                                                      "n2"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KstK"]["n2"][0]],
-                                                                                      "frac"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KstK"]["frac"][0]],
-                                                                                      "cB"    : [-1.2313e-02], "fracD":[6.0568e-01]}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsPi"]["2011"]["KPiPi"] = {"Type":"ExponentialPlusDoubleCrystalBall",
-                                                                                       "mean"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"]["mean"][0]],
-                                                                                       "sigma1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"]["sigma1"][0]],
-                                                                                       "sigma2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"]["sigma2"][0]],
-                                                                                       "alpha1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"]["alpha1"][0]],
-                                                                                       "alpha2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"]["alpha2"][0]],
-                                                                                       "n1"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"]["n1"][0]],
-                                                                                       "n2"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"]["n2"][0]],       
-                                                                                       "frac"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"]["frac"][0]],
-                                                                                       "cB"    : [-2.1421e-03], "fracD":[6.5957e-01]}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsPi"]["2011"]["PiPiPi"] = {"Type":"ExponentialPlusDoubleCrystalBall",
-                                                                                        "mean"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"]["mean"][0]],
-                                                                                        "sigma1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"]["sigma1"][0]],
-                                                                                        "sigma2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"]["sigma2"][0]],
-                                                                                        "alpha1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"]["alpha1"][0]],
-                                                                                        "alpha2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"]["alpha2"][0]],
-                                                                                        "n1"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"]["n1"][0]],
-                                                                                        "n2"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"]["n2"][0]],
-                                                                                        "frac"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"]["frac"][0]],
-                                                                                        "cB"    : [-5.3817e-03], "fracD":[7.5167e-01]}
-    
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsPi"]["2012"] = {}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsPi"]["2012"]["NonRes"] = {"Type":"ExponentialPlusDoubleCrystalBall",
-                                                                                        "mean"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"]["mean"][0]],
-                                                                                        "sigma1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"]["sigma1"][0]],
-                                                                                        "sigma2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"]["sigma2"][0]],
-                                                                                        "alpha1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"]["alpha1"][0]],
-                                                                                        "alpha2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"]["alpha2"][0]],
-                                                                                        "n1"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"]["n1"][0]],
-                                                                                        "n2"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"]["n2"][0]],
-                                                                                        "frac"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"]["frac"][0]],
-                                                                                        "cB"    : [-5.0833e-03], "fracD":[4.9069e-01]}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsPi"]["2012"]["PhiPi"] = {"Type":"ExponentialPlusDoubleCrystalBall",
-                                                                                       "mean"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"]["mean"][0]],
-                                                                                       "sigma1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"]["sigma1"][0]],
-                                                                                       "sigma2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"]["sigma2"][0]],
-                                                                                       "alpha1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"]["alpha1"][0]],
-                                                                                       "alpha2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"]["alpha2"][0]],
-                                                                                       "n1"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"]["n1"][0]],
-                                                                                       "n2"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"]["n2"][0]],
-                                                                                       "frac"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"]["frac"][0]],
-                                                                                       "cB"    : [-1.1455e-02], "fracD":[7.6156e-01] }
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsPi"]["2012"]["KstK"] = {"Type":"ExponentialPlusDoubleCrystalBall",
-                                                                                      "mean"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KstK"]["mean"][0]],
-                                                                                      "sigma1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KstK"]["sigma1"][0]],
-                                                                                      "sigma2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KstK"]["sigma2"][0]],
-                                                                                      "alpha1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KstK"]["alpha1"][0]],
-                                                                                      "alpha2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KstK"]["alpha2"][0]],
-                                                                                      "n1"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KstK"]["n1"][0]],
-                                                                                      "n2"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KstK"]["n2"][0]],
-                                                                                      "frac"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KstK"]["frac"][0]],
-                                                                                      "cB"    : [-1.2313e-02], "fracD":[6.0568e-01]}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsPi"]["2012"]["KPiPi"] = {"Type":"ExponentialPlusDoubleCrystalBall",
-                                                                                       "mean"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"]["mean"][0]],
-                                                                                       "sigma1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"]["sigma1"][0]],
-                                                                                       "sigma2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"]["sigma2"][0]],
-                                                                                       "alpha1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"]["alpha1"][0]],
-                                                                                       "alpha2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"]["alpha2"][0]],
-                                                                                       "n1"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"]["n1"][0]],
-                                                                                       "n2"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"]["n2"][0]],
-                                                                                       "frac"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"]["frac"][0]],
-                                                                                       "cB"    : [-2.1421e-03], "fracD":[6.5957e-01]}
-    configdict["PDFList"]["CharmMass"]["Combinatorial"]["Bs2DsPi"]["2012"]["PiPiPi"] = {"Type":"ExponentialPlusDoubleCrystalBall",
-                                                                                        "mean"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"]["mean"][0]],
-                                                                                        "sigma1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"]["sigma1"][0]],
-                                                                                        "sigma2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"]["sigma2"][0]],
-                                                                                        "alpha1": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"]["alpha1"][0]],
-                                                                                        "alpha2": [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"]["alpha2"][0]],
-                                                                                        "n1"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"]["n1"][0]],
-                                                                                        "n2"    : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"]["n2"][0]],
-                                                                                        "frac"  : [configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"]["frac"][0]],
-                                                                                        "cB"    : [-5.3817e-03], "fracD":[7.5167e-01]}
-    ############################################################
-    
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"] = {}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsPi"] = {}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsPi"]["2011"] = {}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsPi"]["2011"]["NonRes"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                                      "Type": "FromWorkspace", "Workspace" : "workspace", "Contributions":["Pion","Kaon"],
-                                                                                      "Name": {"Up":   {"Pion":"PIDKShape_CombPi_up_2011", "Kaon":"PIDKShape_CombK_up_2011", "fracPIDK":[7.0243e-01]}, 
-                                                                                               "Down": {"Pion":"PIDKShape_CombPi_down_2011", "Kaon":"PIDKShape_CombK_down_2011", "fracPIDK":[7.0243e-01]}}}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsPi"]["2011"]["PhiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                                      "Type": "FromWorkspace", "Workspace" : "workspace", "Contributions":["Pion","Kaon"],
-                                                                                      "Name": {"Up":   {"Pion":"PIDKShape_CombPi_up_2011", "Kaon":"PIDKShape_CombK_up_2011", "fracPIDK":[6.6355e-01]},
-                                                                                               "Down": {"Pion":"PIDKShape_CombPi_down_2011", "Kaon":"PIDKShape_CombK_down_2011", "fracPIDK":[6.6355e-01]}}}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsPi"]["2011"]["KstK"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                                    "Type": "FromWorkspace", "Workspace" : "workspace", "Contributions":["Pion","Kaon"],
-                                                                                    "Name": {"Up":   {"Pion":"PIDKShape_CombPi_up_2011", "Kaon":"PIDKShape_CombK_up_2011", "fracPIDK":[6.4798e-01]},
-                                                                                             "Down": {"Pion":"PIDKShape_CombPi_down_2011", "Kaon":"PIDKShape_CombK_down_2011", "fracPIDK":[6.4798e-01]}}}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsPi"]["2011"]["KPiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                                     "Type": "FromWorkspace", "Workspace" : "workspace", "Contributions":["Pion","Kaon"],
-                                                                                     "Name": {"Up":   {"Pion":"PIDKShape_CombPi_up_2011", "Kaon":"PIDKShape_CombK_up_2011", "fracPIDK":[8.6494e-01]},
-                                                                                              "Down": {"Pion":"PIDKShape_CombPi_down_2011", "Kaon":"PIDKShape_CombK_down_2011", "fracPIDK":[8.6494e-01]}}}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsPi"]["2011"]["PiPiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                                      "Type": "FromWorkspace", "Workspace" : "workspace", "Contributions":["Pion","Kaon"],
-                                                                                      "Name": {"Up":   {"Pion":"PIDKShape_CombPi_up_2011", "Kaon":"PIDKShape_CombK_up_2011", "fracPIDK":[8.8353e-01]},
-                                                                                               "Down": {"Pion":"PIDKShape_CombPi_down_2011", "Kaon":"PIDKShape_CombK_down_2011", "fracPIDK":[8.8353e-01]}}}
-
-
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsPi"]["2012"] = {}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsPi"]["2012"]["NonRes"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                                      "Type": "FromWorkspace", "Workspace" : "workspace", "Contributions":["Pion","Kaon"],
-                                                                                      "Name":  {"Up":   {"Pion":"PIDKShape_CombPi_up_2012", "Kaon":"PIDKShape_CombK_up_2012", "fracPIDK":[7.0243e-01]},
-                                                                                                "Down": {"Pion":"PIDKShape_CombPi_down_2012", "Kaon":"PIDKShape_CombK_down_2012", "fracPIDK":[7.0243e-01]}}}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsPi"]["2012"]["PhiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                                      "Type": "FromWorkspace", "Workspace" : "workspace", "Contributions":["Pion","Kaon"],
-                                                                                      "Name": {"Up":   {"Pion":"PIDKShape_CombPi_up_2012", "Kaon":"PIDKShape_CombK_up_2012", "fracPIDK":[6.6355e-01]},
-                                                                                               "Down": {"Pion":"PIDKShape_CombPi_down_2012", "Kaon":"PIDKShape_CombK_down_2012", "fracPIDK":[6.6355e-01]}}}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsPi"]["2012"]["KstK"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                                    "Type": "FromWorkspace", "Workspace" : "workspace", "Contributions":["Pion","Kaon"],
-                                                                                    "Name": {"Up":   {"Pion":"PIDKShape_CombPi_up_2012", "Kaon":"PIDKShape_CombK_up_2012", "fracPIDK":[6.4798e-01]},
-                                                                                             "Down": {"Pion":"PIDKShape_CombPi_down_2012", "Kaon":"PIDKShape_CombK_down_2012", "fracPIDK":[6.4798e-01]}}}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsPi"]["2012"]["KPiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                                     "Type": "FromWorkspace", "Workspace" : "workspace", "Contributions":["Pion","Kaon"],
-                                                                                     "Name": {"Up":   {"Pion":"PIDKShape_CombPi_up_2012", "Kaon":"PIDKShape_CombK_up_2012", "fracPIDK":[8.6494e-01]},
-                                                                                              "Down": {"Pion":"PIDKShape_CombPi_down_2012", "Kaon":"PIDKShape_CombK_down_2012", "fracPIDK":[8.6494e-01]}}}
-    configdict["PDFList"]["BacPIDK"]["Combinatorial"]["Bs2DsPi"]["2012"]["PiPiPi"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                                      "Type": "FromWorkspace", "Workspace" : "workspace", "Contributions":["Pion","Kaon"],
-                                                                                      "Name": {"Up":   {"Pion":"PIDKShape_CombPi_up_2012", "Kaon":"PIDKShape_CombK_up_2012", "fracPIDK":[8.8353e-01]},
-                                                                                               "Down": {"Pion":"PIDKShape_CombPi_down_2012", "Kaon":"PIDKShape_CombK_down_2012", "fracPIDK":[8.8353e-01]}}}
-
-
-
-
-
-    ############################################################   
-    #                      Bd2DPi          
-    ############################################################   
-    
-    configdict["PDFList"]["BeautyMass"]["Bd2DPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DPi"]["Bs2DsPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DPi"]["Bs2DsPi"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DPi"]["Bs2DsPi"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgBd2DPiPdf_m_both_2011"}
-    configdict["PDFList"]["BeautyMass"]["Bd2DPi"]["Bs2DsPi"]["2012"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DPi"]["Bs2DsPi"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgBd2DPiPdf_m_both_2012"}
-
-    ############################################################
-    configdict["PDFList"]["CharmMass"]["Bd2DPi"] = {}
-    configdict["PDFList"]["CharmMass"]["Bd2DPi"]["Bs2DsPi"] = {}
-    configdict["PDFList"]["CharmMass"]["Bd2DPi"]["Bs2DsPi"]["2011"] = {}
-    configdict["PDFList"]["CharmMass"]["Bd2DPi"]["Bs2DsPi"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgBd2DPiPdf_m_both_2011_Ds"}
-    configdict["PDFList"]["CharmMass"]["Bd2DPi"]["Bs2DsPi"]["2012"] = {}
-    configdict["PDFList"]["CharmMass"]["Bd2DPi"]["Bs2DsPi"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgBd2DPiPdf_m_both_2012_Ds"}
-
-    
-    ############################################################
-    configdict["PDFList"]["BacPIDK"]["Bd2DPi"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bd2DPi"]["Bs2DsPi"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bd2DPi"]["Bs2DsPi"]["2011"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bd2DPi"]["Bs2DsPi"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": {"Up":"PIDKShape_Bd2DPi_up_2011", "Down":"PIDKShape_Bd2DPi_down_2011"}}
-    configdict["PDFList"]["BacPIDK"]["Bd2DPi"]["Bs2DsPi"]["2012"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bd2DPi"]["Bs2DsPi"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                            "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                            "Name": {"Up":"PIDKShape_Bd2DPi_up_2012", "Down":"PIDKShape_Bd2DPi_down_2012"}}
-
-    
-    ############################################################   
-    #                      Lb2LcPi              
-    ############################################################         
-
-    configdict["PDFList"]["BeautyMass"]["Lb2LcPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Lb2LcPi"]["Bs2DsPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Lb2LcPi"]["Bs2DsPi"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Lb2LcPi"]["Bs2DsPi"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgLb2LcPiPdf_m_both_2011"}
-    configdict["PDFList"]["BeautyMass"]["Lb2LcPi"]["Bs2DsPi"]["2012"] = {}
-    configdict["PDFList"]["BeautyMass"]["Lb2LcPi"]["Bs2DsPi"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                                "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                                "Name": "PhysBkgLb2LcPiPdf_m_both_2012"}
-
-    ############################################################                                                                                                                                       
-    configdict["PDFList"]["CharmMass"]["Lb2LcPi"] = {}
-    configdict["PDFList"]["CharmMass"]["Lb2LcPi"]["Bs2DsPi"] = {}
-    configdict["PDFList"]["CharmMass"]["Lb2LcPi"]["Bs2DsPi"]["2011"] = {}
-    configdict["PDFList"]["CharmMass"]["Lb2LcPi"]["Bs2DsPi"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgLb2LcPiPdf_m_both_2011_Ds"}
-    configdict["PDFList"]["CharmMass"]["Lb2LcPi"]["Bs2DsPi"]["2012"] = {}
-    configdict["PDFList"]["CharmMass"]["Lb2LcPi"]["Bs2DsPi"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgLb2LcPiPdf_m_both_2012_Ds"}
-
-
-    ############################################################                                                                                                                                       
-    configdict["PDFList"]["BacPIDK"]["Lb2LcPi"] = {}
-    configdict["PDFList"]["BacPIDK"]["Lb2LcPi"]["Bs2DsPi"] = {}
-    configdict["PDFList"]["BacPIDK"]["Lb2LcPi"]["Bs2DsPi"]["2011"] = {}
-    configdict["PDFList"]["BacPIDK"]["Lb2LcPi"]["Bs2DsPi"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                             "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                             "Name": {"Up":"PIDKShape_Lb2LcPi_up_2011", "Down":"PIDKShape_Lb2LcPi_down_2011"}}
-    configdict["PDFList"]["BacPIDK"]["Lb2LcPi"]["Bs2DsPi"]["2012"] = {}
-    configdict["PDFList"]["BacPIDK"]["Lb2LcPi"]["Bs2DsPi"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                             "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                             "Name": {"Up":"PIDKShape_Lb2LcPi_up_2012", "Down":"PIDKShape_Lb2LcPi_down_2012"}}
-
-    ############################################################                                                                                                                                      
-    #                      Bs2DsK                                                                                                                                                              
-    ############################################################                                                                                                                                  
-
-    configdict["PDFList"]["BeautyMass"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bs2DsK"]["Bs2DsPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bs2DsK"]["Bs2DsPi"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bs2DsK"]["Bs2DsPi"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgBs2DsKPdf_m_both_2011"}
-    configdict["PDFList"]["BeautyMass"]["Bs2DsK"]["Bs2DsPi"]["2012"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bs2DsK"]["Bs2DsPi"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                               "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                               "Name": "PhysBkgBs2DsKPdf_m_both_2012"}
-
-    ############################################################ 
-    configdict["PDFList"]["CharmMass"]["Bs2DsK"] = {}
-    configdict["PDFList"]["CharmMass"]["Bs2DsK"]["Bs2DsPi"] = {}
-    configdict["PDFList"]["CharmMass"]["Bs2DsK"]["Bs2DsPi"]["2011"] = {}
-    configdict["PDFList"]["CharmMass"]["Bs2DsK"]["Bs2DsPi"]["2011"]["NonRes"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsK"]["Bs2DsPi"]["2011"]["PhiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsK"]["Bs2DsPi"]["2011"]["KstK"]    =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KstK"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsK"]["Bs2DsPi"]["2011"]["KPiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsK"]["Bs2DsPi"]["2011"]["PiPiPi"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsK"]["Bs2DsPi"]["2012"] = {}
-    configdict["PDFList"]["CharmMass"]["Bs2DsK"]["Bs2DsPi"]["2012"]["NonRes"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsK"]["Bs2DsPi"]["2012"]["PhiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsK"]["Bs2DsPi"]["2012"]["KstK"]    =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KstK"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsK"]["Bs2DsPi"]["2012"]["KPiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"]
-    configdict["PDFList"]["CharmMass"]["Bs2DsK"]["Bs2DsPi"]["2012"]["PiPiPi"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"]
-
-    ############################################################                                   
-    
-    configdict["PDFList"]["BacPIDK"]["Bs2DsK"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bs2DsK"]["Bs2DsPi"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bs2DsK"]["Bs2DsPi"]["2011"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bs2DsK"]["Bs2DsPi"]["2011"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                             "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                             "Name": {"Up":"PIDKShape_Bs2DsK_up_2011", "Down":"PIDKShape_Bs2DsK_down_2011"}}
-    configdict["PDFList"]["BacPIDK"]["Bs2DsK"]["Bs2DsPi"]["2012"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bs2DsK"]["Bs2DsPi"]["2012"]["All"] = {"File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/splits/work_dspi_2nd_mcpid_signalpid_comb.root",
-                                                                            "Type": "FromWorkspace", "Workspace" : "workspace",
-                                                                            "Name": {"Up":"PIDKShape_Bs2DsK_up_2012", "Down":"PIDKShape_Bs2DsK_down_2012"}}
-
-    
-    ############################################################                                                                                                                                          
-    #                      Bd2DsPi                                 
-    ############################################################
-    
-    scale1_Bd2DPi = 1.00808721452
-    scale2_Bd2DPi = 1.03868673310
-    configdict["PDFList"]["BeautyMass"]["Bd2DsPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DsPi"]["Bs2DsPi"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DsPi"]["Bs2DsPi"]["2011"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DsPi"]["Bs2DsPi"]["2011"]["NonRes"] = {"Type" : "DoubleCrystalBall",
-                                                                                   "mean" :  [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"]["mean"][0] - 86.8], 
-                                                                                   "sigma1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"]["sigma1"][0]*scale1_Bd2DPi], 
-                                                                                   "sigma2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"]["sigma1"][0]*scale2_Bd2DPi], 
-                                                                                   "alpha1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"]["alpha1"][0]],
-                                                                                   "alpha2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"]["alpha2"][0]], 
-                                                                                   "n1"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"]["n1"][0]], 
-                                                                                   "n2"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"]["n2"][0]], 
-                                                                                   "frac"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"]["frac"][0]]}
-
-    configdict["PDFList"]["BeautyMass"]["Bd2DsPi"]["Bs2DsPi"]["2011"]["PhiPi"] = {"Type" : "DoubleCrystalBall",
-                                                                                  "mean"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"]["mean"][0] - 86.8],
-                                                                                  "sigma1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"]["sigma1"][0]*scale1_Bd2DPi],
-                                                                                  "sigma2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"]["sigma1"][0]*scale2_Bd2DPi],
-                                                                                  "alpha1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"]["alpha1"][0]],
-                                                                                  "alpha2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"]["alpha2"][0]],
-                                                                                  "n1"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"]["n1"][0]],
-                                                                                  "n2"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"]["n2"][0]],
-                                                                                  "frac"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"]["frac"][0]]}
-
-    configdict["PDFList"]["BeautyMass"]["Bd2DsPi"]["Bs2DsPi"]["2011"]["KstK"] = {"Type" : "DoubleCrystalBall",
-                                                                                 "mean"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["KstK"]["mean"][0] - 86.8],
-                                                                                 "sigma1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["KstK"]["sigma1"][0]*scale1_Bd2DPi],
-                                                                                 "sigma2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["KstK"]["sigma1"][0]*scale2_Bd2DPi],
-                                                                                 "alpha1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["KstK"]["alpha1"][0]],
-                                                                                 "alpha2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["KstK"]["alpha2"][0]],
-                                                                                 "n1"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["KstK"]["n1"][0]],
-                                                                                 "n2"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["KstK"]["n2"][0]],
-                                                                                 "frac"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["KstK"]["frac"][0]]}
-
-    configdict["PDFList"]["BeautyMass"]["Bd2DsPi"]["Bs2DsPi"]["2011"]["KPiPi"] = {"Type" : "DoubleCrystalBall",
-                                                                                  "mean"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"]["mean"][0] - 86.8],
-                                                                                  "sigma1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"]["sigma1"][0]*scale1_Bd2DPi],
-                                                                                  "sigma2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"]["sigma1"][0]*scale2_Bd2DPi],
-                                                                                  "alpha1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"]["alpha1"][0]],
-                                                                                  "alpha2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"]["alpha2"][0]],
-                                                                                  "n1"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"]["n1"][0]],
-                                                                                  "n2"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"]["n2"][0]],
-                                                                                  "frac"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"]["frac"][0]]}
-
-    configdict["PDFList"]["BeautyMass"]["Bd2DsPi"]["Bs2DsPi"]["2011"]["PiPiPi"] = {"Type" : "DoubleCrystalBall",
-                                                                                   "mean"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"]["mean"][0] - 86.8],
-                                                                                   "sigma1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"]["sigma1"][0]*scale1_Bd2DPi],
-                                                                                   "sigma2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"]["sigma1"][0]*scale2_Bd2DPi],
-                                                                                   "alpha1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"]["alpha1"][0]],
-                                                                                   "alpha2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"]["alpha2"][0]],
-                                                                                   "n1"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"]["n1"][0]],
-                                                                                   "n2"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"]["n2"][0]],
-                                                                                   "frac"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"]["frac"][0]]}
-
-    configdict["PDFList"]["BeautyMass"]["Bd2DsPi"]["Bs2DsPi"]["2012"] = {}
-    configdict["PDFList"]["BeautyMass"]["Bd2DsPi"]["Bs2DsPi"]["2012"]["NonRes"] = {"Type" : "DoubleCrystalBall",
-                                                                                   "mean"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"]["mean"][0] - 86.8],
-                                                                                   "sigma1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"]["sigma1"][0]*scale1_Bd2DPi],
-                                                                                   "sigma2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"]["sigma1"][0]*scale2_Bd2DPi],
-                                                                                   "alpha1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"]["alpha1"][0]],
-                                                                                   "alpha2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"]["alpha2"][0]],
-                                                                                   "n1"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"]["n1"][0]],
-                                                                                   "n2"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"]["n2"][0]],
-                                                                                   "frac"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"]["frac"][0]]}
-
-    configdict["PDFList"]["BeautyMass"]["Bd2DsPi"]["Bs2DsPi"]["2012"]["PhiPi"] = {"Type" : "DoubleCrystalBall",
-                                                                                  "mean"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"]["mean"][0] - 86.8],
-                                                                                  "sigma1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"]["sigma1"][0]*scale1_Bd2DPi],
-                                                                                  "sigma2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"]["sigma1"][0]*scale2_Bd2DPi],
-                                                                                  "alpha1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"]["alpha1"][0]],
-                                                                                  "alpha2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"]["alpha2"][0]],
-                                                                                  "n1"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"]["n1"][0]],
-                                                                                  "n2"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"]["n2"][0]],
-                                                                                  "frac"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"]["frac"][0]]}
-
-    configdict["PDFList"]["BeautyMass"]["Bd2DsPi"]["Bs2DsPi"]["2012"]["KstK"] = {"Type" : "DoubleCrystalBall",
-                                                                                 "mean"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["KstK"]["mean"][0] - 86.8],
-                                                                                 "sigma1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["KstK"]["sigma1"][0]*scale1_Bd2DPi],
-                                                                                 "sigma2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["KstK"]["sigma1"][0]*scale2_Bd2DPi],
-                                                                                 "alpha1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["KstK"]["alpha1"][0]],
-                                                                                 "alpha2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["KstK"]["alpha2"][0]],
-                                                                                 "n1"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["KstK"]["n1"][0]],
-                                                                                 "n2"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["KstK"]["n2"][0]],
-                                                                                 "frac"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["KstK"]["frac"][0]]}
-
-    configdict["PDFList"]["BeautyMass"]["Bd2DsPi"]["Bs2DsPi"]["2012"]["KPiPi"] = {"Type" : "DoubleCrystalBall",
-                                                                                  "mean"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"]["mean"][0] - 86.8],
-                                                                                  "sigma1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"]["sigma1"][0]*scale1_Bd2DPi],
-                                                                                  "sigma2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"]["sigma1"][0]*scale2_Bd2DPi],
-                                                                                  "alpha1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"]["alpha1"][0]],
-                                                                                  "alpha2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"]["alpha2"][0]],
-                                                                                  "n1"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"]["n1"][0]],
-                                                                                  "n2"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"]["n2"][0]],
-                                                                                  "frac"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"]["frac"][0]]}
-    
-    configdict["PDFList"]["BeautyMass"]["Bd2DsPi"]["Bs2DsPi"]["2012"]["PiPiPi"] = {"Type" : "DoubleCrystalBall",
-                                                                                   "mean"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"]["mean"][0] - 86.8],
-                                                                                   "sigma1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"]["sigma1"][0]*scale1_Bd2DPi],
-                                                                                   "sigma2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"]["sigma1"][0]*scale2_Bd2DPi],
-                                                                                   "alpha1": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"]["alpha1"][0]],
-                                                                                   "alpha2": [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"]["alpha2"][0]],
-                                                                                   "n1"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"]["n1"][0]],
-                                                                                   "n2"    : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"]["n2"][0]],
-                                                                                   "frac"  : [configdict["PDFList"]["BeautyMass"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"]["frac"][0]]}
-
-
-
-    #############################################################
-
-    configdict["PDFList"]["CharmMass"]["Bd2DsPi"] = {}
-    configdict["PDFList"]["CharmMass"]["Bd2DsPi"]["Bs2DsPi"] = {}
-    configdict["PDFList"]["CharmMass"]["Bd2DsPi"]["Bs2DsPi"]["2011"] = {}
-    configdict["PDFList"]["CharmMass"]["Bd2DsPi"]["Bs2DsPi"]["2011"]["NonRes"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"]
-    configdict["PDFList"]["CharmMass"]["Bd2DsPi"]["Bs2DsPi"]["2011"]["PhiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"]
-    configdict["PDFList"]["CharmMass"]["Bd2DsPi"]["Bs2DsPi"]["2011"]["KstK"]    =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KstK"]
-    configdict["PDFList"]["CharmMass"]["Bd2DsPi"]["Bs2DsPi"]["2011"]["KPiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"]
-    configdict["PDFList"]["CharmMass"]["Bd2DsPi"]["Bs2DsPi"]["2011"]["PiPiPi"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"]
-    configdict["PDFList"]["CharmMass"]["Bd2DsPi"]["Bs2DsPi"]["2012"] = {}
-    configdict["PDFList"]["CharmMass"]["Bd2DsPi"]["Bs2DsPi"]["2012"]["NonRes"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"]
-    configdict["PDFList"]["CharmMass"]["Bd2DsPi"]["Bs2DsPi"]["2012"]["PhiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"]
-    configdict["PDFList"]["CharmMass"]["Bd2DsPi"]["Bs2DsPi"]["2012"]["KstK"]    =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KstK"]
-    configdict["PDFList"]["CharmMass"]["Bd2DsPi"]["Bs2DsPi"]["2012"]["KPiPi"]   =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"]
-    configdict["PDFList"]["CharmMass"]["Bd2DsPi"]["Bs2DsPi"]["2012"]["PiPiPi"]  =  configdict["PDFList"]["CharmMass"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"]
-
-    #############################################################
-
-    configdict["PDFList"]["BacPIDK"]["Bd2DsPi"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bd2DsPi"]["Bs2DsPi"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bd2DsPi"]["Bs2DsPi"]["2011"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bd2DsPi"]["Bs2DsPi"]["2011"]["NonRes"]  =  configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2011"]["NonRes"]
-    configdict["PDFList"]["BacPIDK"]["Bd2DsPi"]["Bs2DsPi"]["2011"]["PhiPi"]   =  configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2011"]["PhiPi"]
-    configdict["PDFList"]["BacPIDK"]["Bd2DsPi"]["Bs2DsPi"]["2011"]["KstK"]    =  configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2011"]["KstK"]
-    configdict["PDFList"]["BacPIDK"]["Bd2DsPi"]["Bs2DsPi"]["2011"]["KPiPi"]   =  configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2011"]["KPiPi"]
-    configdict["PDFList"]["BacPIDK"]["Bd2DsPi"]["Bs2DsPi"]["2011"]["PiPiPi"]  =  configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2011"]["PiPiPi"]
-    configdict["PDFList"]["BacPIDK"]["Bd2DsPi"]["Bs2DsPi"]["2012"] = {}
-    configdict["PDFList"]["BacPIDK"]["Bd2DsPi"]["Bs2DsPi"]["2012"]["NonRes"]  =  configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2012"]["NonRes"]
-    configdict["PDFList"]["BacPIDK"]["Bd2DsPi"]["Bs2DsPi"]["2012"]["PhiPi"]   =  configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2012"]["PhiPi"]
-    configdict["PDFList"]["BacPIDK"]["Bd2DsPi"]["Bs2DsPi"]["2012"]["KstK"]    =  configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2012"]["KstK"]
-    configdict["PDFList"]["BacPIDK"]["Bd2DsPi"]["Bs2DsPi"]["2012"]["KPiPi"]   =  configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2012"]["KPiPi"]
-    configdict["PDFList"]["BacPIDK"]["Bd2DsPi"]["Bs2DsPi"]["2012"]["PiPiPi"]  =  configdict["PDFList"]["BacPIDK"]["Signal"]["Bs2DsPi"]["2012"]["PiPiPi"]
-
-
-
-
-    ############################################################ 
-    #Tagging calibration and mistag PDF. If "MistagPDF" : None,
-    #then a average mistag is used
-    ############################################################
-    
-    configdict["Taggers"] = {}
-    for comp in configdict["Components"].keys():
-        configdict["Taggers"][comp] = {}
-        configdict["Taggers"][comp] = {"OS" :
-                                       {"Calibration":
-                                        {"p0"       : [0.0],
-                                         "p1"       : [1.0],
-                                         "deltap0"  : [0.0],
-                                         "deltap1"  : [0.0],
-                                         "avgeta"   : [0.35],
-                                         "tageff"   : [0.6],
-                                         "tagasymm" : [0.0]
-                                         },
-                                        "MistagPDF" :
-                                        {"Type"     : "Mock",
-                                         "eta0"     : [0.0],
-                                         "etaavg"   : [0.35],
-                                         "f"        : [0.25]
-                                         }
-                                        },
-                                       "SS":
-                                       {"Calibration":
-                                        {"p0"       : [0.0],
-                                         "p1"       : [1.0],
-                                         "deltap0"  : [0.0],
-                                         "deltap1"  : [0.0],
-                                         "avgeta"   : [0.35],
-                                         "tageff"   : [0.6],
-                                         "tagasymm" : [0.0]
-                                         },
-                                        "MistagPDF" :
-                                        {"Type"     : "Mock",
-                                         "eta0"     : [0.0],
-                                         "etaavg"   : [0.35],
-                                         "f"        : [0.25]
-                                         }
-                                        }
-                                       }
-
-    ############################################################ 
-    #Time resolution and acceptance (there is a single dict because
-    #they are strongly connected in the way they are built).
-    #If "TimeErrorPDF" : None, then an average resolution model
-    #is used.
-    ############################################################
-    
-    configdict["ResolutionAcceptance"] = {}
-    for comp in configdict["Components"].keys():
-        configdict["ResolutionAcceptance"][comp] = {}
-        configdict["ResolutionAcceptance"][comp] = {"TimeErrorPDF": #None,
-                                                    {"Type": "Mock",
-                                                     "ResolutionAverage" : [0.5]
-                                                     },
-                                                    "Acceptance":
-                                                    {"Type": "Spline",
-                                                     "KnotPositions" : [ 0.5, 1.0, 1.5, 2.0, 3.0, 12.0 ],
-                                                     "KnotCoefficients" : [ 4.5853e-01, 6.8963e-01, 8.8528e-01,
-                                                                            1.1296e+00, 1.2232e+00, 1.2277e+00 ]},
-                                                    #"Resolution":
-                                                    #{"Type": "AverageModel",
-                                                    # "Parameters": { 'sigmas': [ 0.050 ], 'fractions': [] },
-                                                    # "Bias": [0.0],
-                                                    # "ScaleFactor": [1.0]}
-                                                    "Resolution":
-                                                    {"Type": "GaussianWithPEDTE",
-                                                     "Average": [0.5],
-                                                     "Bias": [0.0],
-                                                     "ScaleFactor": [1.0]}
-                                                    }
-        
-    ############################################################ 
-    #Production and detection asymmetries
-    ############################################################
-    
-    configdict["ProductionAsymmetry"] = {}
-    configdict["DetectionAsymmetry"] = {}
-    for comp in configdict["Components"].keys():
-        configdict["ProductionAsymmetry"][comp] = {}
-        configdict["DetectionAsymmetry"][comp] = {}
-        configdict["ProductionAsymmetry"][comp] = [0.1]
-        configdict["DetectionAsymmetry"][comp] = [0.1]
-
-    ############################################################ 
-    #Time PDF parameters
-    ############################################################
-    
-    configdict["ACP"] = {}
-
-    #Parameters from https://svnweb.cern.ch/trac/lhcb/browser/DBASE/tags/Gen/DecFiles/v27r42/dkfiles/Bd_D-pi+,Kpipi=CPVDDalitz,DecProdCut.dec)
-    ModqOverp_d     =  1
-    ArgqOverp_d     =  -0.746
-    ModpOverq_d     =  1
-    ArgpOverq_d     =  0.746
-    ModAf_d         =  0.0849
-    ArgAf_d         =  0.002278
-    ModAbarf_d      =  0.00137
-    ArgAbarf_d      =  -1.128958
-    ModAfbar_d      =  0.00137
-    ArgAfbar_d      =  1.3145
-    ModAbarfbar_d   =  0.0849
-    ArgAbarfbar_d   =  0.002278
-
-    #Signal (use more convenient interface with ArgLf_d, ArgLbarfbar_d and ModLf_d)
-    configdict["ACP"]["Signal"] = { "Gamma"                : [0.656],
-                                    "DeltaGamma"           : [0.00267],
-                                    "DeltaM"               : [0.510],
-                                    "ArgLf"                : [ArgqOverp_d + ArgAbarf_d - ArgAf_d],
-                                    "ArgLbarfbar"          : [ArgpOverq_d + ArgAfbar_d - ArgAbarfbar_d],
-                                    "ModLf"                : [old_div(ModAbarf_d,ModAf_d)],
-                                    "ParameteriseIntegral" : True,
-                                    "NBinsAcceptance"      : 0, #keep at zero if using spline acceptance!
-                                    "NBinsProperTimeErr"   : 100}
-
-    for comp in configdict["Components"].keys():
-        if comp != "Signal":
-            #Use other interface with C, S, Sbar, D, Dbar
-            #We build trivial PDFs since we don't care about background shapes in time if we use sWeights
-            configdict["ACP"][comp] = { "Gamma"                 : [1.0],
-                                        "DeltaGamma"            : [0.0],
-                                        "DeltaM"                : [0.0],
-                                        "C"                     : [0.0],
-                                        "S"                     : [0.0],
-                                        "Sbar"                  : [0.0],
-                                        "D"                     : [0.0],
-                                        "Dbar"                  : [0.0],
-                                        "ParameteriseIntegral"  : True,
-                                        "NBinsAcceptance"       : 0, #keep at zero if using spline acceptance!
-                                        "NBinsProperTimeErr"    : 100}
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/SignalConfigForFit.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/SignalConfigForFit.py
deleted file mode 100644
index e53be5e9629cec52cf71b07a34270504e825db4a..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/SignalConfigForFit.py
+++ /dev/null
@@ -1,115 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bs2DsPi"
-    configdict["CharmModes"] = {"PiPiPi"} #"NonRes","PhiPi","KstK","KPiPi","PiPiPi"} 
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2011"} 
-    # stripping (necessary in case of PIDK shapes)
-    configdict["Stripping"] = {"2011":"21r1","2012":"21"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes) 
-    configdict["IntegratedLuminosity"] = {"2011": {"Down": 1.00, "Up": 1.0}, "2012":{"Down": 0.9894, "Up": 0.9985}} #0.59, 0.44
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/Bs2DsPi/config_Bs2DsPi.txt"
-    #settings for control plots 
-    configdict["ControlPlots"] = {} 
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsPi", "Extension":"pdf"} 
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5600    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,    0.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [-0.0,     1.0    ], "InputName" : "BDTGResponse_2"}
-
-    # additional cuts applied to data sets
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0",            "MC" : "lab2_TAU>0&&lab1_M<200", "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9&&lab45_MM<1700", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                     
-    # order of particles: KKPi, KPiPi, PiPiPi                                
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-    #weighting templates by PID eff/misID
-    configdict["WeightingMassTemplates"]= { "PIDBachEff":            { "FileLabel": { "2011":"#PID Pion 2011", "2012":"#PID Pion 2012"},
-                                                                       "Var":"lab1_P", "HistName":"MyPionEff_0"},
-                                            "PIDBachMisID":          { "FileLabel": { "2011":"#PID Pion 2011", "2012":"#PID Pion 2012"},
-                                                                       "Var":"lab1_P", "HistName":"MyPionMisID_0"},
-                                            "PIDChildKaonPionMisID": { "FileLabel": { "2011":"#PID Pion 2011", "2012":"#PID Pion 2012"},
-                                                                       "Var":"lab3_P", "HistName":"MyPionMisID_0"},
-                                            "PIDChildProtonMisID":   { "FileLabel": { "2011":"#PID Proton 2011", "2012":"#PID Proton 2012"},
-                                                                       "Var":"lab4_P", "HistName":"MyProtonMisID_pKm5_KPi5"},
-                                            "RatioDataMC":True,
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-
-    
-    #weighting for PID templates
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[20,20] }
-
-    
-    # Bs signal shapes                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBall"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"All":1.0717e+01}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"All":1.6005e+01}, "Fixed":False}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"All":2.2118e+00}, "Fixed":False}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"All":-2.4185e+00}, "Fixed":False}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"All":10.0}, "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"All":10.0}, "Fixed":True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"All":0.5}, "Fixed":True}
-
-    #Ds signal shapes                                                                                                
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBall"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"KKPi":5.3468e+00,  "KPiPi":8.8531e+00,  "PiPiPi":8.0860e+00}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"KKPi":5.1848e+00,  "KPiPi":5.2073e+00,  "PiPiPi":7.3773e+00}, "Fixed":False}
-    #configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"KKPi":1.2252e+00,  "KPiPi":1.7131e+00,  "PiPiPi":9.0639e-01}, "Fixed":False}
-    #configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"KKPi":-1.1167e+00, "KPiPi":-2.5276e+00, "PiPiPi":-1.1122e+00}, "Fixed":False}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"KKPi":1.1289e+00,  "KPiPi":1.5928e+00,  "PiPiPi": 8.0885e-01}, "Fixed":False}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"KKPi":-1.1200e+00, "KPiPi":-4.6258e+00, "PiPiPi":-1.2172e+00}, "Fixed":False}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"KKPi":4.6625e+00,  "KPiPi":2.0239e+00,  "PiPiPi":10.0}, "Fixed":True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"KKPi":6.9989e+01,  "KPiPi":1.0860e+00,  "PiPiPi":10.0}, "Fixed":True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"KKPi":4.7565e-01,  "KPiPi":5.5084e-01,  "PiPiPi":0.5}, "Fixed":True}
-
-    #expected yields                                                                                                                                                              
-    configdict["Yields"] = {}
-    configdict["Yields"]["Signal"]  = {"2011": {"NonRes":50000.0,  "PhiPi":50000.0, "KstK":50000.0, "KPiPi":50000.0, "PiPiPi":50000.0},
-                                       "2012": {"NonRes":50000.0,  "PhiPi":50000.0, "KstK":50000.0, "KPiPi":50000.0, "PiPiPi":50000.0}, "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#            
-    ###                                                               MDfit plotting settings                                                                                 
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------# 
- 
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = { "EPDF": ["Sig"],
-                                                 "PDF":  ["Sig"],
-                                                 "Legend": ["Sig"]}
-    configdict["PlotSettings"]["colors"] = { "PDF": [kBlue+2],
-                                             "Legend": [kBlue+2]}
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66], 
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/config_Bs2DsPi.txt b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/config_Bs2DsPi.txt
deleted file mode 100644
index 3a45fc583b4c9c0afe8ded148ce3f4808c55f91a..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/config_Bs2DsPi.txt
+++ /dev/null
@@ -1,479 +0,0 @@
-#B2DPi KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bd_Dpi_2011_Dw.root
-Bd_Dpi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#B2DPi KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bd_Dpi_2012_Dw.root
-Bd_Dpi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi NonRes 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_nonres_2011_Dw.root
-Bs_Dspi_nonres_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PhiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_phipi_2011_Dw.root
-Bs_Dspi_phipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KstK 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_KstK_2011_Dw.root
-Bs_Dspi_KstK_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_Kpipi_2011_Dw.root
-Bs_Dspi_Kpipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PiPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_pipipi_2011_Dw.root
-Bs_Dspi_pipipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi NonRes 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_nonres_2012_Dw.root
-Bs_Dspi_nonres_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PhiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_phipi_2012_Dw.root
-Bs_Dspi_phipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KstK 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_KstK_2012_Dw.root
-Bs_Dspi_KstK_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_Kpipi_2012_Dw.root
-Bs_Dspi_Kpipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PiPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED/
-Bs_Dspi_pipipi_2012_Dw.root
-Bs_Dspi_pipipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#sWeights
-/afs/cern.ch/work/a/adudziak/public/sWeights/
-sWeights_BsDsPi_all_both.root
-sWeights_BsDsPi_all_both.root
-merged
-merged
-###
-
-#PID Pion 2012 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21_2012_MagDown_P.root
-Pi_Strip21_2012_MagUp_P.root
-###
-
-#PID Kaon 2012 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21_2012_MagDown_P.root
-K_Strip21_2012_MagUp_P.root
-###
-
-#PID ProtonXXX 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_TotLc_Strip21_2012_MagDown_P.root
-P_TotLc_Strip21_2012_MagUp_P.root
-###
-
-#PID Proton 2012 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip20_2012_MagDown_P.root
-P_Strip20_2012_MagUp_P.root
-###
-
-#PID Pion 2011 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21r1_2011_MagDown_P.root
-Pi_Strip21r1_2011_MagUp_P.root
-###
-
-#PID Kaon 2011 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21r1_2011_MagDown_P.root
-K_Strip21r1_2011_MagUp_P.root
-###
-
-#PID ProtonXXX 2011 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_TotLc_Strip21r1_2011_MagDown_P.root
-P_TotLc_Strip21r1_2011_MagUp_P.root
-###
-
-#PID Proton 2011 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip20r1_2011_MagDown_P.root
-P_Strip20r1_2011_MagUp_P.root
-###
-
-
-#PIDp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_TightCuts.root
-EffHistos_Reco12_39Mom_Proton_MagUp_TightCuts.root
-###
-
-#PID
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PIDK Pion 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21r1_2011_MagDown_nTracks_P.root
-Pi_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Pion 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21_2012_MagDown_nTracks_P.root
-Pi_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21r1_2011_MagDown_nTracks_P.root
-K_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21_2012_MagDown_nTracks_P.root
-K_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Proton 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21r1_2011_MagDown_nTracks_P.root
-P_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Proton 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21_2012_MagDown_nTracks_P.root
-P_Strip21_2012_MagUp_nTracks_P.root
-###
-
-
-#PID2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_45678.root
-EffHistos_Reco12_39Mom_MagUp_3456.root
-###
-
-#RatioDataMC2D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-MomVsnTr_Comp_DPi_Down_hist.root
-MomVsnTr_Comp_DPi_Up_hist.root
-###
-
-
-#RatioDataMC 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/
-MomVsnTr_Comp_DPi_2011_dw_hist.root
-MomVsnTr_Comp_DPi_2011_up_hist.root
-###
-
-#RatioDataMC 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/
-MomVsnTr_Comp_DPi_2012_dw_hist.root
-MomVsnTr_Comp_DPi_2012_up_hist.root
-###
-
-#RatioDataMC 2011 PEta
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_eta/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PEta
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_eta/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-
-#RatioDataMC 2011 PNTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PNTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-
-
-#RatioDataMC3D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-PtVsnTrVsP_Comp_DPi_Down_hist.root
-PtVsnTrVsP_Comp_DPi_Up_hist.root
-###
-
-#MC FileName KKPi MD 2011
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_Dsrho_KKpi_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_Dsstpi_KKpi_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Lb_Lambdacpi_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_DsK_KKpi_CPV_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MU 2011
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_Dsrho_KKpi_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_Dsstpi_KKpi_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Lb_Lambdacpi_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_DsK_KKpi_CPV_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MD 2012
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_Dsrho_KKpi_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_Dsstpi_KKpi_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Lb_Lambdacpi_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_DsK_KKpi_CPV_Dn_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MU 2012
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_Dsrho_KKpi_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_Dsstpi_KKpi_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Lb_Lambdacpi_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/B2DX_MC_Bs_DsK_KKpi_CPV_Up_BDTG_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-
-#Kfactor MC FileName MD
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-#Kfactor MC FileName MU
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-
-#Signal Bs2DsPi KstK 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_Dspi_KKpi_Dn_OFFLINE_Bs_Dspi_KstK.root
-B2DX_MC_Bs_Dspi_KKpi_Up_OFFLINE_Bs_Dspi_KstK.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi PhiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_Dspi_KKpi_Dn_OFFLINE_Bs_Dspi_phipi.root
-B2DX_MC_Bs_Dspi_KKpi_Up_OFFLINE_Bs_Dspi_phipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi NonRes 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_Dspi_KKpi_Dn_OFFLINE_Bs_Dspi_nonres.root
-B2DX_MC_Bs_Dspi_KKpi_Up_OFFLINE_Bs_Dspi_nonres.root
-DecayTree
-DecayTree
-###
-
-
-#Signal Bs2DsPi KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_Dspi_Kpipi_Dn_OFFLINE_Bs_Dspi_Kpipi.root
-B2DX_MC_Bs_Dspi_Kpipi_Up_OFFLINE_Bs_Dspi_Kpipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi PiPiPi 2011 hhhhhhhhhhhhhhh
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_Dspi_pipipi_Up_BDTG_Bs.root
-B2DX_MC_Bs_Dspi_pipipi_Dn_BDTG_Bs.root
-DecayTree
-DecayTree
-###
-
-
-#Signal Bs2DsPi PiPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_Dspi_pipipi_Dn_OFFLINE_Bs_Dspi_pipipi.root
-B2DX_MC_Bs_Dspi_pipipi_Up_OFFLINE_Bs_Dspi_pipipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi KstK 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_Dspi_KKpi_Dn_OFFLINE_Bs_Dspi_KstK.root
-B2DX_MC_Bs_Dspi_KKpi_Up_OFFLINE_Bs_Dspi_KstK.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi PhiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_Dspi_KKpi_Dn_OFFLINE_Bs_Dspi_phipi.root
-B2DX_MC_Bs_Dspi_KKpi_Up_OFFLINE_Bs_Dspi_phipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi NonRes 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_Dspi_KKpi_Dn_OFFLINE_Bs_Dspi_nonres.root
-B2DX_MC_Bs_Dspi_KKpi_Up_OFFLINE_Bs_Dspi_nonres.root
-DecayTree
-DecayTree
-###
-
-
-#Signal Bs2DsPi KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_Dspi_Kpipi_Dn_OFFLINE_Bs_Dspi_Kpipi.root
-B2DX_MC_Bs_Dspi_Kpipi_Up_OFFLINE_Bs_Dspi_Kpipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi PiPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_Dspi_pipipi_Dn_OFFLINE_Bs_Dspi_pipipi.root
-B2DX_MC_Bs_Dspi_pipipi_Up_OFFLINE_Bs_Dspi_pipipi.root
-DecayTree
-DecayTree
-###
-
-
-
-
-#PID2m2
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_0123.root
-EffHistos_Reco12_39Mom_MagUp_2m2_012.root
-###
-
-#PID2m22
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_45678.root
-EffHistos_Reco12_39Mom_MagUp_2m2_3456.root
-###
-
-#PIDp3
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_Proton_DLLKDLLpK.root
-EffHistos_Reco12_39Mom_MagUp_Proton_DLLKDLLpK.root
-###
-
-
-
-
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/config_Bs2DsPi_newBDTG.txt b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/config_Bs2DsPi_newBDTG.txt
deleted file mode 100644
index 85d3e7e02ad3cb213e398ff7916aa4d84b752a46..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/config_Bs2DsPi_newBDTG.txt
+++ /dev/null
@@ -1,491 +0,0 @@
-#B2DPi KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bd_Dpi_2011_Dw.root
-Bd_Dpi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#B2DPi KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bd_Dpi_2012_Dw.root
-Bd_Dpi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi NonRes 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_nonres_2011_Dw.root
-Bs_Dspi_nonres_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PhiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_phipi_2011_Dw.root
-Bs_Dspi_phipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KstK 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_KstK_2011_Dw.root
-Bs_Dspi_KstK_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_Kpipi_2011_Dw.root
-Bs_Dspi_Kpipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PiPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_pipipi_2011_Dw.root
-Bs_Dspi_pipipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi NonRes 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_nonres_2012_Dw.root
-Bs_Dspi_nonres_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PhiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_phipi_2012_Dw.root
-Bs_Dspi_phipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KstK 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_KstK_2012_Dw.root
-Bs_Dspi_KstK_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_Kpipi_2012_Dw.root
-Bs_Dspi_Kpipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PiPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_pipipi_2012_Dw.root
-Bs_Dspi_pipipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#sWeights
-/afs/cern.ch/work/a/adudziak/public/sWeights/
-sWeights_BsDsPi_all_both.root
-sWeights_BsDsPi_all_both.root
-merged
-merged
-###
-
-#PID Pion 2012 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21_2012_MagDown_P.root
-Pi_Strip21_2012_MagUp_P.root
-###
-
-#PID Kaon 2012 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21_2012_MagDown_P.root
-K_Strip21_2012_MagUp_P.root
-###
-
-#PID ProtonXXX 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_TotLc_Strip21_2012_MagDown_P.root
-P_TotLc_Strip21_2012_MagUp_P.root
-###
-
-#PID Proton 2012 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip20_2012_MagDown_P.root
-P_Strip20_2012_MagUp_P.root
-###
-
-#PID Pion 2011 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21r1_2011_MagDown_P.root
-Pi_Strip21r1_2011_MagUp_P.root
-###
-
-#PID Kaon 2011 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21r1_2011_MagDown_P.root
-K_Strip21r1_2011_MagUp_P.root
-###
-
-#PID ProtonXXX 2011 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_TotLc_Strip21r1_2011_MagDown_P.root
-P_TotLc_Strip21r1_2011_MagUp_P.root
-###
-
-#PID Proton 2011 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip20r1_2011_MagDown_P.root
-P_Strip20r1_2011_MagUp_P.root
-###
-
-
-#PIDp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_TightCuts.root
-EffHistos_Reco12_39Mom_Proton_MagUp_TightCuts.root
-###
-
-#PID
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PIDK Pion 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21r1_2011_MagDown_nTracks_P.root
-Pi_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Pion 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21_2012_MagDown_nTracks_P.root
-Pi_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21r1_2011_MagDown_nTracks_P.root
-K_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21_2012_MagDown_nTracks_P.root
-K_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Proton 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21r1_2011_MagDown_nTracks_P.root
-P_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Proton 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21_2012_MagDown_nTracks_P.root
-P_Strip21_2012_MagUp_nTracks_P.root
-###
-
-
-#PID2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_45678.root
-EffHistos_Reco12_39Mom_MagUp_3456.root
-###
-
-#RatioDataMC2D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-MomVsnTr_Comp_DPi_Down_hist.root
-MomVsnTr_Comp_DPi_Up_hist.root
-###
-
-
-#RatioDataMC 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/
-MomVsnTr_Comp_DPi_2011_dw_hist.root
-MomVsnTr_Comp_DPi_2011_up_hist.root
-###
-
-#RatioDataMC 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/
-MomVsnTr_Comp_DPi_2012_dw_hist.root
-MomVsnTr_Comp_DPi_2012_up_hist.root
-###
-
-#RatioDataMC 2011 PEta
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_eta/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PEta
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_eta/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-
-#RatioDataMC 2011 PNTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PNTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-
-#RatioDataMC 2011 PNTr Filtered
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/filtered/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PNTr Filtered
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/filtered/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-
-#RatioDataMC3D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-PtVsnTrVsP_Comp_DPi_Down_hist.root
-PtVsnTrVsP_Comp_DPi_Up_hist.root
-###
-
-#MC FileName KKPi MD 2011
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsrho_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstpi_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_DsK_KKpi_CPV_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MU 2011
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsrho_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstpi_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_DsK_KKpi_CPV_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MD 2012
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsrho_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstpi_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_DsK_KKpi_CPV_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MU 2012
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsrho_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstpi_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_DsK_KKpi_CPV_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-
-#Kfactor MC FileName MD
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-#Kfactor MC FileName MU
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-
-#Signal Bs2DsPi KstK 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_Dspi_KKpi_Dn_OFFLINE_Bs_Dspi_KstK.root
-B2DX_MC_Bs_Dspi_KKpi_Up_OFFLINE_Bs_Dspi_KstK.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi PhiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_Dspi_KKpi_Dn_OFFLINE_Bs_Dspi_phipi.root
-B2DX_MC_Bs_Dspi_KKpi_Up_OFFLINE_Bs_Dspi_phipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi NonRes 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_Dspi_KKpi_Dn_OFFLINE_Bs_Dspi_nonres.root
-B2DX_MC_Bs_Dspi_KKpi_Up_OFFLINE_Bs_Dspi_nonres.root
-DecayTree
-DecayTree
-###
-
-
-#Signal Bs2DsPi KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_Dspi_Kpipi_Dn_OFFLINE_Bs_Dspi_Kpipi.root
-B2DX_MC_Bs_Dspi_Kpipi_Up_OFFLINE_Bs_Dspi_Kpipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi PiPiPi 2011 hhhhhhhhhhhhhhh
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_Dspi_pipipi_Up_BDTG_Bs.root
-B2DX_MC_Bs_Dspi_pipipi_Dn_BDTG_Bs.root
-DecayTree
-DecayTree
-###
-
-
-#Signal Bs2DsPi PiPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_Dspi_pipipi_Dn_OFFLINE_Bs_Dspi_pipipi.root
-B2DX_MC_Bs_Dspi_pipipi_Up_OFFLINE_Bs_Dspi_pipipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi KstK 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_Dspi_KKpi_Dn_OFFLINE_Bs_Dspi_KstK.root
-B2DX_MC_Bs_Dspi_KKpi_Up_OFFLINE_Bs_Dspi_KstK.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi PhiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_Dspi_KKpi_Dn_OFFLINE_Bs_Dspi_phipi.root
-B2DX_MC_Bs_Dspi_KKpi_Up_OFFLINE_Bs_Dspi_phipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi NonRes 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_Dspi_KKpi_Dn_OFFLINE_Bs_Dspi_nonres.root
-B2DX_MC_Bs_Dspi_KKpi_Up_OFFLINE_Bs_Dspi_nonres.root
-DecayTree
-DecayTree
-###
-
-
-#Signal Bs2DsPi KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_Dspi_Kpipi_Dn_OFFLINE_Bs_Dspi_Kpipi.root
-B2DX_MC_Bs_Dspi_Kpipi_Up_OFFLINE_Bs_Dspi_Kpipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi PiPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_Dspi_pipipi_Dn_OFFLINE_Bs_Dspi_pipipi.root
-B2DX_MC_Bs_Dspi_pipipi_Up_OFFLINE_Bs_Dspi_pipipi.root
-DecayTree
-DecayTree
-###
-
-
-
-
-#PID2m2
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_0123.root
-EffHistos_Reco12_39Mom_MagUp_2m2_012.root
-###
-
-#PID2m22
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_45678.root
-EffHistos_Reco12_39Mom_MagUp_2m2_3456.root
-###
-
-#PIDp3
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_Proton_DLLKDLLpK.root
-EffHistos_Reco12_39Mom_MagUp_Proton_DLLKDLLpK.root
-###
-
-
-
-
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/config_Bs2DsPi_newBDTG_filteredSignal.txt b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/config_Bs2DsPi_newBDTG_filteredSignal.txt
deleted file mode 100644
index 832673c169e5971fa063038667b09e8a95174044..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/Bs2DsPi/config_Bs2DsPi_newBDTG_filteredSignal.txt
+++ /dev/null
@@ -1,491 +0,0 @@
-#B2DPi KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bd_Dpi_2011_Dw.root
-Bd_Dpi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#B2DPi KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bd_Dpi_2012_Dw.root
-Bd_Dpi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi NonRes 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_nonres_2011_Dw.root
-Bs_Dspi_nonres_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PhiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_phipi_2011_Dw.root
-Bs_Dspi_phipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KstK 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_KstK_2011_Dw.root
-Bs_Dspi_KstK_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_Kpipi_2011_Dw.root
-Bs_Dspi_Kpipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PiPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_pipipi_2011_Dw.root
-Bs_Dspi_pipipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi NonRes 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_nonres_2012_Dw.root
-Bs_Dspi_nonres_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PhiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_phipi_2012_Dw.root
-Bs_Dspi_phipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KstK 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_KstK_2012_Dw.root
-Bs_Dspi_KstK_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_Kpipi_2012_Dw.root
-Bs_Dspi_Kpipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PiPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_pipipi_2012_Dw.root
-Bs_Dspi_pipipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#sWeights
-/afs/cern.ch/work/a/adudziak/public/sWeights/
-sWeights_BsDsPi_all_both.root
-sWeights_BsDsPi_all_both.root
-merged
-merged
-###
-
-#PID Pion 2012 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21_2012_MagDown_P.root
-Pi_Strip21_2012_MagUp_P.root
-###
-
-#PID Kaon 2012 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21_2012_MagDown_P.root
-K_Strip21_2012_MagUp_P.root
-###
-
-#PID ProtonXXX 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_TotLc_Strip21_2012_MagDown_P.root
-P_TotLc_Strip21_2012_MagUp_P.root
-###
-
-#PID Proton 2012 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip20_2012_MagDown_P.root
-P_Strip20_2012_MagUp_P.root
-###
-
-#PID Pion 2011 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21r1_2011_MagDown_P.root
-Pi_Strip21r1_2011_MagUp_P.root
-###
-
-#PID Kaon 2011 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21r1_2011_MagDown_P.root
-K_Strip21r1_2011_MagUp_P.root
-###
-
-#PID ProtonXXX 2011 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_TotLc_Strip21r1_2011_MagDown_P.root
-P_TotLc_Strip21r1_2011_MagUp_P.root
-###
-
-#PID Proton 2011 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip20r1_2011_MagDown_P.root
-P_Strip20r1_2011_MagUp_P.root
-###
-
-
-#PIDp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_TightCuts.root
-EffHistos_Reco12_39Mom_Proton_MagUp_TightCuts.root
-###
-
-#PID
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PIDK Pion 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21r1_2011_MagDown_nTracks_P.root
-Pi_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Pion 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21_2012_MagDown_nTracks_P.root
-Pi_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21r1_2011_MagDown_nTracks_P.root
-K_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21_2012_MagDown_nTracks_P.root
-K_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Proton 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21r1_2011_MagDown_nTracks_P.root
-P_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Proton 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21_2012_MagDown_nTracks_P.root
-P_Strip21_2012_MagUp_nTracks_P.root
-###
-
-
-#PID2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_45678.root
-EffHistos_Reco12_39Mom_MagUp_3456.root
-###
-
-#RatioDataMC2D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-MomVsnTr_Comp_DPi_Down_hist.root
-MomVsnTr_Comp_DPi_Up_hist.root
-###
-
-
-#RatioDataMC 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/
-MomVsnTr_Comp_DPi_2011_dw_hist.root
-MomVsnTr_Comp_DPi_2011_up_hist.root
-###
-
-#RatioDataMC 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/
-MomVsnTr_Comp_DPi_2012_dw_hist.root
-MomVsnTr_Comp_DPi_2012_up_hist.root
-###
-
-#RatioDataMC 2011 PEta
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_eta/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PEta
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_eta/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-
-#RatioDataMC 2011 PNTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PNTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-
-#RatioDataMC 2011 PNTr Filtered
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/filtered/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PNTr Filtered
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/filtered/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-
-#RatioDataMC3D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-PtVsnTrVsP_Comp_DPi_Down_hist.root
-PtVsnTrVsP_Comp_DPi_Up_hist.root
-###
-
-#MC FileName KKPi MD 2011
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsrho_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstpi_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_DsK_KKpi_CPV_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MU 2011
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsrho_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstpi_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_DsK_KKpi_CPV_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MD 2012
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsrho_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstpi_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_DsK_KKpi_CPV_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MU 2012
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsrho_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstpi_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_DsK_KKpi_CPV_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-
-#Kfactor MC FileName MD
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-#Kfactor MC FileName MU
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-
-#Signal Bs2DsPi KstK 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC_Filtered/FINAL/
-B2DX_MC_Bs_Dspi_KKpi_2011_Dn_OFFLINE_Bs_Dspi_KstK.root
-B2DX_MC_Bs_Dspi_KKpi_2011_Up_OFFLINE_Bs_Dspi_KstK.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi PhiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC_Filtered/FINAL/
-B2DX_MC_Bs_Dspi_KKpi_2011_Dn_OFFLINE_Bs_Dspi_phipi.root
-B2DX_MC_Bs_Dspi_KKpi_2011_Up_OFFLINE_Bs_Dspi_phipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi NonRes 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC_Filtered/FINAL/
-B2DX_MC_Bs_Dspi_KKpi_2011_Dn_OFFLINE_Bs_Dspi_nonres.root
-B2DX_MC_Bs_Dspi_KKpi_2011_Up_OFFLINE_Bs_Dspi_nonres.root
-DecayTree
-DecayTree
-###
-
-
-#Signal Bs2DsPi KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC_Filtered/FINAL/
-B2DX_MC_Bs_Dspi_Kpipi_2011_Dn_OFFLINE_Bs_Dspi_Kpipi.root
-B2DX_MC_Bs_Dspi_Kpipi_2011_Up_OFFLINE_Bs_Dspi_Kpipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi PiPiPi 2011 hhhhhhhhhhhhhhh
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_Dspi_pipipi_Up_BDTG_Bs.root
-B2DX_MC_Bs_Dspi_pipipi_Dn_BDTG_Bs.root
-DecayTree
-DecayTree
-###
-
-
-#Signal Bs2DsPi PiPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC_Filtered/FINAL/
-B2DX_MC_Bs_Dspi_pipipi_2011_Dn_OFFLINE_Bs_Dspi_pipipi.root
-B2DX_MC_Bs_Dspi_pipipi_2011_Up_OFFLINE_Bs_Dspi_pipipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi KstK 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC_Filtered/FINAL/
-B2DX_MC_Bs_Dspi_KKpi_2012_Dn_OFFLINE_Bs_Dspi_KstK.root
-B2DX_MC_Bs_Dspi_KKpi_2012_Up_OFFLINE_Bs_Dspi_KstK.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi PhiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC_Filtered/FINAL/
-B2DX_MC_Bs_Dspi_KKpi_2012_Dn_OFFLINE_Bs_Dspi_phipi.root
-B2DX_MC_Bs_Dspi_KKpi_2012_Up_OFFLINE_Bs_Dspi_phipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi NonRes 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC_Filtered/FINAL/
-B2DX_MC_Bs_Dspi_KKpi_2012_Dn_OFFLINE_Bs_Dspi_nonres.root
-B2DX_MC_Bs_Dspi_KKpi_2012_Up_OFFLINE_Bs_Dspi_nonres.root
-DecayTree
-DecayTree
-###
-
-
-#Signal Bs2DsPi KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC_Filtered/FINAL/
-B2DX_MC_Bs_Dspi_Kpipi_2012_Dn_OFFLINE_Bs_Dspi_Kpipi.root
-B2DX_MC_Bs_Dspi_Kpipi_2012_Up_OFFLINE_Bs_Dspi_Kpipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi PiPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC_Filtered/FINAL/
-B2DX_MC_Bs_Dspi_pipipi_2012_Dn_OFFLINE_Bs_Dspi_pipipi.root
-B2DX_MC_Bs_Dspi_pipipi_2012_Up_OFFLINE_Bs_Dspi_pipipi.root
-DecayTree
-DecayTree
-###
-
-
-
-
-#PID2m2
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_0123.root
-EffHistos_Reco12_39Mom_MagUp_2m2_012.root
-###
-
-#PID2m22
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_45678.root
-EffHistos_Reco12_39Mom_MagUp_2m2_3456.root
-###
-
-#PIDp3
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_Proton_DLLKDLLpK.root
-EffHistos_Reco12_39Mom_MagUp_Proton_DLLKDLLpK.root
-###
-
-
-
-
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/misID/Bd2DPiConfigForMisIDCalculation.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/misID/Bd2DPiConfigForMisIDCalculation.py
deleted file mode 100644
index 7e7cc15f7f79fcd79f25ad9e18b10fcf1a54ef8c..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/misID/Bd2DPiConfigForMisIDCalculation.py
+++ /dev/null
@@ -1,54 +0,0 @@
-def getconfig() :
-
-
-
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bd2DPi"
-    configdict["CharmModes"] = {"KstK","NonRes","PhiPi"}
-    #configdict["CharmModes"] = {"KPiPi"}
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2011", "2012"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                  
-    configdict["IntegratedLuminosity"] = {"2011": {"Down": 0.59, "Up": 0.44}, "2012":{"Down": 0.9894, "Up": 0.9985}}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/misID/config_ExpectedEvents.txt"
-    #settings for control plots                                                                                                                                                           
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotLb2LcPiNewPID2012", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,    6.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.1,     1.0     ], "InputName" : "BDTGResponse_3"}
-
-    # additional cuts applied to data sets                                                                                    
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0",            "MC" : "lab2_TAU>0&&lab1_M<200", "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "", "MC":"lab34_MM<1840 && lab2_FDCHI2_ORIVX > 2 && lab2_FD_ORIVX > 0"}
-    configdict["AdditionalCuts"]["NonRes"] = { "Data": "", "MC": "((!(abs(lab34_MM-1020)<20)) && (!(abs(lab45_MM-892.0) < 50.)))"}
-    configdict["AdditionalCuts"]["PhiPi"]  = { "Data": "", "MC": "abs(lab34_MM-1020)<20"}
-    configdict["AdditionalCuts"]["NonRes"] = { "Data": "", "MC": "((!(abs(lab34_MM-1020)<20 )) && ((abs(lab45_MM-892.0) < 50.)))"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "", "MC" : "lab34_MM < 1750 && lab2_FDCHI2_ORIVX > 9 && lab2_FD_ORIVX > 0"}
-
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                                                    
-    # order of particles: KKPi, KPiPi, PiPiPi                                                                                                                                                  
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/misID/Bd2DPiConfigForNominalMassFit.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/misID/Bd2DPiConfigForNominalMassFit.py
deleted file mode 100644
index 4df854fe54f73297f423f24bf45ef15ae4086379..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/misID/Bd2DPiConfigForNominalMassFit.py
+++ /dev/null
@@ -1,96 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bd2DPi"
-    configdict["CharmModes"] = {"KstK","NonRes","PhiPi"}
-    #configdict["CharmModes"] = {"KPiPi"}
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2011", "2012"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                  
-    configdict["IntegratedLuminosity"] = {"2011": {"Down": 0.59, "Up": 0.44}, "2012":{"Down": 0.9894, "Up": 0.9985}}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/misID/config_Bd2DPi.txt"
-    #settings for control plots                                                                                                                                                           
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBd2DPi", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5200,    5800    ], "InputName" : "lab0_MassHypo_DPi_DFav"} # for KKPi
-    #configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5500,    6000    ], "InputName" : "lab0_MassHypo_DPi_DSup"} # for KPiPi - double misID
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,    6.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.1,     1.0     ], "InputName" : "BDTGResponse_3"}
-
-    # additional cuts applied to data sets             
-    HLTcut = "(lab0_Hlt1TrackAllL0Decision_TOS == 1 && (lab0_Hlt2IncPhiDecision_TOS ==1 || lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1))";
-    Bsmass = "&&lab0_MassFitConsD_M >5300 && lab0_MassFitConsD_M <5800"
-
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0&&lab1_PIDmu<2&&"+HLTcut+Bsmass, 
-                                               "MC" :  "lab2_TAU>0&&lab1_M<200&&"+HLTcut+Bsmass, "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes                                                                                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBall"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5270.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"NonRes":1.6878e+01,  "PhiPi":1.5228e+01,  "KstK":1.7260e+01,  "KPiPi":1.7791e+01,  "PiPiPi":1.7955e+01},  "Fixed":False}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"NonRes":1.1200e+01,  "PhiPi":1.2361e+01,  "KstK":1.1436e+01,  "KPiPi":1.1036e+01,  "PiPiPi":1.1608e+01},  "Fixed":False}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"NonRes":-2.0314e+00, "PhiPi":-1.7275e+00, "KstK":-2.2307e+00, "KPiPi":-2.5874e+00, "PiPiPi":-2.2449e+00}, "Fixed":False}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"NonRes":1.6351e+00,  "PhiPi":1.5425e+00,  "KstK":2.1032e+00,  "KPiPi":2.3644e+00,  "PiPiPi":2.0136e+00},  "Fixed":False}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"NonRes":3.6820e+00,  "PhiPi":4.4322e+00,  "KstK":2.8836e+00,  "KPiPi":1.7676e+00,  "PiPiPi":2.7271e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"NonRes":1.5081e+00,  "PhiPi":1.5073e+00,  "KstK":6.1945e-01,  "KPiPi":3.2020e-01,  "PiPiPi":6.7857e-01},  "Fixed":True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.5,         "PhiPi":0.5,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},  "Fixed":True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"NonRes":1.00,        "PhiPi":1.0,          "Kstk":1.0,        "KPiPi":1.0,         "PiPiPi":1.0}, "Fixed":False}
-
-    #configdict["BsSignalShape"]["scaleSigma"] = { "2011": {"frac1": 1.22, "frac2":1.28}} 
-    # combinatorial background                                                                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"]  = "Exponential"
-    configdict["BsCombinatorialShape"]["cB"]   = {"Run1": {"NonRes":-3.5211e-03,  "PhiPi":-3.0873e-03,  "KstK":-2.3392e-03, "KPiPi":-1.0361e-03, "PiPiPi":-1.5277e-03},"Fixed": False}
-
-
-    #expected yields                                                                                                                                                       
-    configdict["Yields"] = {}
-    #configdict["Yields"]["CombBkg"]         = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-    #                                           "2012": { "NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},"Fixed":False}
-    configdict["Yields"]["Signal"]          = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                               "2012": { "NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},"Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig"] #, "CombBkg"] 
-    configdict["PlotSettings"]["colors"] = [kRed-7, kOrange]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.60, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.375,0.875], "ScaleYSize":1.0}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.0, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.20,0.9], "ScaleYSize":1.2}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/misID/Lb2LcPiConfigForMisIDCalculation.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/misID/Lb2LcPiConfigForMisIDCalculation.py
deleted file mode 100644
index dc4d68641bae5e7e74c76e7f6404d4e503baf9ce..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/misID/Lb2LcPiConfigForMisIDCalculation.py
+++ /dev/null
@@ -1,54 +0,0 @@
-def getconfig() :
-
-
-
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Lb2LcPi"
-    configdict["CharmModes"] = {"KstK","NonRes","PhiPi"}
-    #configdict["CharmModes"] = {"KPiPi"}
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2011", "2012"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                  
-    configdict["IntegratedLuminosity"] = {"2011": {"Down": 0.59, "Up": 0.44}, "2012":{"Down": 0.9894, "Up": 0.9985}}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/misID/config_ExpectedEvents.txt"
-    #settings for control plots                                                                                                                                                           
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotLb2LcPiNewPID2012", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,    6.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.1,     1.0     ], "InputName" : "BDTGResponse_3"}
-
-    # additional cuts applied to data sets                                                                                    
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0",            "MC" : "lab2_TAU>0&&lab1_M<200", "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "", "MC":"lab34_MM<1840 && lab2_FDCHI2_ORIVX > 2 && lab2_FD_ORIVX > 0"}
-    configdict["AdditionalCuts"]["NonRes"] = { "Data": "", "MC": "((!(abs(lab34_MM-1020)<20)) && (!(abs(lab45_MM-892.0) < 50.)))"}
-    configdict["AdditionalCuts"]["PhiPi"]  = { "Data": "", "MC": "abs(lab34_MM-1020)<20"}
-    configdict["AdditionalCuts"]["NonRes"] = { "Data": "", "MC": "((!(abs(lab34_MM-1020)<20 )) && ((abs(lab45_MM-892.0) < 50.)))"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "", "MC" : "lab34_MM < 1750 && lab2_FDCHI2_ORIVX > 9 && lab2_FD_ORIVX > 0"}
-
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                                                    
-    # order of particles: KKPi, KPiPi, PiPiPi                                                                                                                                                  
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/misID/Lb2LcPiConfigForNominalMassFit.py b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/misID/Lb2LcPiConfigForNominalMassFit.py
deleted file mode 100644
index 8114a59940a7040e837fa8d26cec9da421972a14..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/misID/Lb2LcPiConfigForNominalMassFit.py
+++ /dev/null
@@ -1,97 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Lb2LcPi"
-    #configdict["CharmModes"] = {"KstK","NonRes","PhiPi"}
-    configdict["CharmModes"] = {"KPiPi"}
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2011", "2012"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                  
-    configdict["IntegratedLuminosity"] = {"2011": {"Down": 0.59, "Up": 0.44}, "2012":{"Down": 0.9894, "Up": 0.9985}}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/Bs2DsK_3fbCPV/misID/config_Lb2LcPi.txt"
-    #settings for control plots                                                                                                                                                           
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotLb2LcPi", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    #configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5500,    6000    ], "InputName" : "lab0_MassHypo_LcPi_LambdaFav"} # for KKPi
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5500,    6000    ], "InputName" : "lab0_MassHypo_LcPi_LambdaSup"} # for KPiPi - double misID
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,    6.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.1,     1.0     ], "InputName" : "BDTGResponse_3"}
-
-    # additional cuts applied to data sets             
-    HLTcut = "(lab0_Hlt1TrackAllL0Decision_TOS == 1 && (lab0_Hlt2IncPhiDecision_TOS ==1 || lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1))";
-    Bsmass = "&&lab0_MassFitConsD_M >5300 && lab0_MassFitConsD_M <5800"
-    correction = "&&!(fabs(lab2_MassHypo_KKPi_Lambda-2285) > 30 || lab3_PIDp-lab3_PIDK < 5)"
-
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0&&lab1_PIDmu<2&&"+HLTcut+Bsmass+correction, 
-                                               "MC" :  "lab2_TAU>0&&lab1_M<200&&"+HLTcut+Bsmass+correction, "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes                                                                                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5670.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"NonRes":1.6878e+01,  "PhiPi":1.5228e+01,  "KstK":1.7260e+01,  "KPiPi":1.7791e+01,  "PiPiPi":1.7955e+01},  "Fixed":True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"NonRes":1.1200e+01,  "PhiPi":1.2361e+01,  "KstK":1.1436e+01,  "KPiPi":1.1036e+01,  "PiPiPi":1.1608e+01},  "Fixed":True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"NonRes":-2.0314e+00, "PhiPi":-1.7275e+00, "KstK":-2.2307e+00, "KPiPi":-2.5874e+00, "PiPiPi":-2.2449e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"NonRes":1.6351e+00,  "PhiPi":1.5425e+00,  "KstK":2.1032e+00,  "KPiPi":2.3644e+00,  "PiPiPi":2.0136e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"NonRes":3.6820e+00,  "PhiPi":4.4322e+00,  "KstK":2.8836e+00,  "KPiPi":1.7676e+00,  "PiPiPi":2.7271e+00},  "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"NonRes":1.5081e+00,  "PhiPi":1.5073e+00,  "KstK":6.1945e-01,  "KPiPi":3.2020e-01,  "PiPiPi":6.7857e-01},  "Fixed":True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"NonRes":0.5,         "PhiPi":0.5,         "KstK":0.5,         "KPiPi":0.5,         "PiPiPi":0.5},  "Fixed":True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"NonRes":1.00,        "PhiPi":1.0,          "Kstk":1.0,        "KPiPi":1.0,         "PiPiPi":1.0}, "Fixed":False}
-
-    #configdict["BsSignalShape"]["scaleSigma"] = { "2011": {"frac1": 1.22, "frac2":1.28}} 
-    # combinatorial background                                                                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"]  = "Exponential"
-    configdict["BsCombinatorialShape"]["cB"]   = {"Run1": {"NonRes":-3.5211e-03,  "PhiPi":-3.0873e-03,  "KstK":-2.3392e-03, "KPiPi":-1.0361e-03, "PiPiPi":-1.5277e-03},"Fixed": False}
-
-
-    #expected yields                                                                                                                                                       
-    configdict["Yields"] = {}
-    configdict["Yields"]["CombBkg"]         = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                               "2012": { "NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},"Fixed":False}
-    configdict["Yields"]["Signal"]          = {"2011": { "NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0},
-                                               "2012": { "NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},"Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg"] 
-    configdict["PlotSettings"]["colors"] = [kRed-7, kOrange]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.60, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.375,0.875], "ScaleYSize":1.0}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.0, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.20,0.9], "ScaleYSize":1.2}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/misID/config_Bd2DPi.txt b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/misID/config_Bd2DPi.txt
deleted file mode 100644
index 801b582be554b532d12eb38330ae24f2d1eecc01..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/misID/config_Bd2DPi.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-#Bd2DPi NonRes 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_nonres_DHypo_2011_Dw.root
-Bs_Dspi_nonres_DHypo_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bd2DPi PhiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_phipi_DHypo_2011_Dw.root
-Bs_Dspi_phipi_DHypo_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bd2DPi KstK 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_KstK_DHypo_2011_Dw.root
-Bs_Dspi_KstK_DHypo_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bd2DPi KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_Kpipi_DHypo_2011_Dw.root
-Bs_Dspi_Kpipi_DHypo_2011_Up.root
-DecayTree
-DecayTree
-###
-
-
-#Bd2DPi NonRes 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_nonres_DHypo_2012_Dw.root
-Bs_Dspi_nonres_DHypo_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bd2DPi PhiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_phipi_DHypo_2012_Dw.root
-Bs_Dspi_phipi_DHypo_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bd2DPi KstK 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_KstK_DHypo_2012_Dw.root
-Bs_Dspi_KstK_DHypo_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bd2DPi KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_Kpipi_DHypo_2012_Dw.root
-Bs_Dspi_Kpipi_DHypo_2012_Up.root
-DecayTree
-DecayTree
-###
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/misID/config_ExpectedEvents.txt b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/misID/config_ExpectedEvents.txt
deleted file mode 100644
index fb91705ac5ac905952a2181bc0d78d2364d33973..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/misID/config_ExpectedEvents.txt
+++ /dev/null
@@ -1,239 +0,0 @@
-#Bd2DPi BsHypo NonRes
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG3_Bs.root
-B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG3_Bs.root
-DecayTree
-DecayTree
-###
-
-
-#Bd2DPi BsHypo KstK
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG3_Bs.root
-B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG3_Bs.root
-DecayTree
-DecayTree
-###
-
-
-#Bd2DPi BsHypo PhiPi
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG3_Bs.root
-B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG3_Bs.root
-DecayTree
-DecayTree
-###
-
-#Bd2DPi BsHypo KPiPi
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG3_Bs.root
-B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG3_Bs.root
-DecayTree
-DecayTree
-###
-
-#Bd2DPi BdHypo
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG3_Bd.root
-B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG3_Bd.root
-DecayTree
-DecayTree
-###
-
-#BDK
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bd2DK_D2KPiPi_BdHypo_BDTG.root
-MergedTree_Bd2DK_D2KPiPi_BdHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-
-#LbLcPi PhiPi
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Lb_Lambdacpi_Dn_BDTG3_Bs.root
-B2DX_MC_Lb_Lambdacpi_Up_BDTG3_Bs.root
-DecayTree
-DecayTree
-###
-
-#LbLcPi KstK
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Lb_Lambdacpi_Dn_BDTG3_Bs.root
-B2DX_MC_Lb_Lambdacpi_Up_BDTG3_Bs.root
-DecayTree
-DecayTree
-###
-
-#LbLcPi NonRes
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Lb_Lambdacpi_Dn_BDTG3_Bs.root
-B2DX_MC_Lb_Lambdacpi_Up_BDTG3_Bs.root
-DecayTree
-DecayTree
-###
-
-#LbLcPi KPiPi
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Lb_Lambdacpi_Dn_BDTG3_Bs.root
-B2DX_MC_Lb_Lambdacpi_Up_BDTG3_Bs.root
-DecayTree
-DecayTree
-###
-
-#LbLcPi PiPiPi
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Lb_Lambdacpi_Dn_BDTG_Bs.root
-B2DX_MC_Lb_Lambdacpi_Up_BDTG_Bs.root
-DecayTree
-DecayTree
-###
-
-#LbDsp
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-Merged_Lb2Dsp_Ds2KKPi_MD_BsHypo_BDTG.root
-Merged_Lb2Dsp_Ds2KKPi_MU_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#LbDsstp
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-Merged_Lb2Dsstp_Ds2KKPi_MD_BsHypo_BDTG.root
-Merged_Lb2Dsstp_Ds2KKPi_MU_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-
-#PID Pion 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21r1_2011_MagDown_P.root
-Pi_Strip21r1_2011_MagUp_P.root
-###
-
-#PID Pion 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21_2012_MagDown_P.root
-Pi_Strip21_2012_MagUp_P.root
-###
-
-#PID Kaon 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21r1_2011_MagDown_P.root
-K_Strip21r1_2011_MagUp_P.root
-###
-
-#PID Kaon 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21_2012_MagDown_P.root
-K_Strip21_2012_MagUp_P.root
-###
-
-#PID Proton 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21r1_2011_MagDown_P.root
-P_Strip21r1_2011_MagUp_P.root
-###
-
-#PID Proton 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21_2012_MagDown_P.root
-P_Strip21_2012_MagUp_P.root
-###
-
-#PID Proton 2011 TotLc
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_TotLc_Strip21r1_2011_MagDown_P.root
-P_TotLc_Strip21r1_2011_MagUp_P.root
-###
-
-#PID Proton 2012 TotLc
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_TotLc_Strip21_2012_MagDown_P.root
-P_TotLc_Strip21_2012_MagUp_P.root
-###
-
-
-
-
-#PIDp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_TightCuts.root
-EffHistos_Reco12_39Mom_Proton_MagUp_TightCuts.root
-###
-
-#PID3
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PID
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PID2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_45678.root
-EffHistos_Reco12_39Mom_MagUp_3456.root
-###
-
-
-#PID Dsp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_DLLpDLLpK.root
-EffHistos_Reco12_39Mom_Proton_MagDown_DLLpDLLpK.root
-###
-
-#PIDp2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_36Mom_Proton_MagDown_DLL.root
-EffHistos_Reco12_36Mom_Proton_MagUp_DLL.root
-###
-
-#PID2m2
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_0123.root
-EffHistos_Reco12_39Mom_MagUp_2m2_012.root
-###
-
-#PID2m22
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_45678.root
-EffHistos_Reco12_39Mom_MagUp_2m2_3456.root
-###
-
-#PIDp3
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_Proton_DLLKDLLpK.root
-EffHistos_Reco12_39Mom_MagUp_Proton_DLLKDLLpK.root
-###
-
-#RatioDataMC2DDDDDDD
-/afs/cern.ch/work/a/adudziak/public/workspace/
-MomVsnTr_Comp_DPi_Down_hist.root
-MomVsnTr_Comp_DPi_Up_hist.root
-###
-
-
-#RatioDataMC2D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/pT_nTracks/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-#RatioDataMC 2012 PTnTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/pT_nTracks/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-
-#RatioDataMC3D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-PtVsnTrVsP_Comp_DPi_Down_hist.root
-PtVsnTrVsP_Comp_DPi_Up_hist.root
-###
diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/misID/config_Lb2LcPi.txt b/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/misID/config_Lb2LcPi.txt
deleted file mode 100644
index 801851965eef737ccbe78755b7cb0a0f535915d7..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsK_3fbCPV/misID/config_Lb2LcPi.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-#Lb2LcPi NonRes 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_nonres_LcHypo_2011_Dw.root
-Bs_Dspi_nonres_LcHypo_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Lb2LcPi PhiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_phipi_LcHypo_2011_Dw.root
-Bs_Dspi_phipi_LcHypo_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Lb2LcPi KstK 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_KstK_LcHypo_2011_Dw.root
-Bs_Dspi_KstK_LcHypo_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Lb2LcPi KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_Kpipi_LcHypo_2011_Dw.root
-Bs_Dspi_Kpipi_LcHypo_2011_Up.root
-DecayTree
-DecayTree
-###
-
-
-#Lb2LcPi NonRes 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_nonres_LcHypo_2012_Dw.root
-Bs_Dspi_nonres_LcHypo_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Lb2LcPi PhiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_phipi_LcHypo_2012_Dw.root
-Bs_Dspi_phipi_LcHypo_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Lb2LcPi KstK 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_KstK_LcHypo_2012_Dw.root
-Bs_Dspi_KstK_LcHypo_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Lb2LcPi KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_Kpipi_LcHypo_2012_Dw.root
-Bs_Dspi_Kpipi_LcHypo_2012_Up.root
-DecayTree
-DecayTree
-###
diff --git a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbBR/Bs2DsstPi/Bs2DsstPiConfigForNominalMassFit.py b/PhysFit/B2DXFitters/data/Bs2DsstK_3fbBR/Bs2DsstPi/Bs2DsstPiConfigForNominalMassFit.py
deleted file mode 100644
index f0f8e6fa4b0a87151f06f1f28ae35b888a97d493..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbBR/Bs2DsstPi/Bs2DsstPiConfigForNominalMassFit.py
+++ /dev/null
@@ -1,216 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bs2DsstPi"
-    # configdict["CharmModes"] = {"NonRes", "PhiPi", "KstK"}
-    # configdict["CharmModes"] = { "KKPi" }
-    configdict["CharmModes"] = { "NonRes" }
-    # year of data taking                                                                                 
-    configdict["YearOfDataTaking"] = {"2012", "2011"}
-    # stripping (necessary in case of PIDK shapes)                               
-    configdict["Stripping"] = {"2012":"20", "2011":"20r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)
-    configdict["IntegratedLuminosity"] = {"2011":{"Down": 0.57, "Up": 0.43}, "2012":{"Down": 0.49, "Up": 0.51}} 
-    # file name with paths to MC/data samples                                     
-    configdict["dataName"]   = "../data/Bs2DsstK_3fbCPV/Bs2DsstPi/config_Bs2DsstPi.txt"
-
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsstPi", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5100,    6000    ], "InputName" : "FBs_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1950,    1990    ], "InputName" : "FDs_M"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.0,     1.e+9   ], "InputName" : "FBs_LF_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [1000.,   650000.0], "InputName" : "FBac_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [1000.,   45000.0 ], "InputName" : "FBac_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [0.0,     150,    ], "InputName" : "FBac_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.,     1000.0  ], "InputName" : "FnTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.0,     1.e+9   ], "InputName" : "FBs_LF_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "FBac_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.025,   1.0     ], "InputName" : "FBDT_Var"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "FBs_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "FBs_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [0.0,     0.5     ], "InputName" : "FBs_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [0.0,     0.5     ], "InputName" : "FBs_SS_nnetKaon_PROB"}
-    # additional variables in data sets
-    '''
-    configdict["AdditionalVariables"] = {}
-    configdict["AdditionalVariables"]["PhEta"]    = { "Range" : [-9.0,    9.0     ], "InputName" : "FPh_Eta"}
-    configdict["AdditionalVariables"]["PhPT"]     = { "Range" : [ 0.0,    1.e+9   ], "InputName" : "FPh_Ptr"}
-    configdict["AdditionalVariables"]["PhCL"]     = { "Range" : [ 0.0,    1.0     ], "InputName" : "FPh_CL"}
-    configdict["AdditionalVariables"]["BsEta"]    = { "Range" : [-9.0,    9.0     ], "InputName" : "FBs_Eta"}
-    configdict["AdditionalVariables"]["BsPT"]     = { "Range" : [ 0.0,    1.e+9   ], "InputName" : "FBs_Ptr"}
-    configdict["AdditionalVariables"]["DsPiMass"] = { "Range" : [4500,    6000    ], "InputName" : "FDsBac_M"}
-    '''
-
-    # tagging calibration                                                                                               
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3834, "p1": 0.9720, "average": 0.3813}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4244, "p1": 1.2180, "average": 0.4097}
-
-    # additional cuts applied to data sets
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = {"Data": "FDs_M>1950&&FDs_M<1990&&FDelta_M>124&&FDelta_M<164&&((FDsBac_M-FDs_M)<3370||(FDsBac_M-FDs_M)>3440)&&FBDT_Var>0",
-                                              "MC":   "FDs_M>1950&&FDs_M<1990&&FDelta_M>124&&FDelta_M<164&&((FDsBac_M-FDs_M)<3370||(FDsBac_M-FDs_M)>3440)&&FBDT_Var>0"}
- 
-    configdict["CreateCombinatorial"] = {}
-    configdict["CreateCombinatorial"]["BeautyMass"] = {} 
-    configdict["CreateCombinatorial"]["BeautyMass"]["All"]    = {"Cut":"FBs_M>5100&&FBs_M<6000&&FDs_M>1950&&FDs_M<1990&&FDelta_M>185&&FDelta_M<205&&((FDsBac_M-FDs_M)<3370||(FDsBac_M-FDs_M)>3440)&&FBDT_Var>0&&FBac_P>1000&&FBac_P<650000&&FBac_PT>1000&&FBac_PT<45000", "Rho":3.5, "Mirror":"Both"}
-    configdict["CreateCombinatorial"]["BeautyMass"]["NonRes"] = {"Cut":"FDs_M>1950"}
-
-    #weighting for PID templates
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[20,20] }
-
-    #PID Calibration samples for PID shapes
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID0_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID0_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID0_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID0_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { "FileName":"",
-                                                                  "WorkName":"workspace", "DataName":"dataSetCombPi_BeautyMass", "Type":"Workspace",
-                                                                  "WeightName":"", "PIDVarName":"BacPIDK", "Variables":["BacPT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { "FileName":"",
-                                                                  "WorkName":"workspace", "DataName":"dataSetCombPi_BeautyMass", "Type":"Workspace",
-                                                                  "WeightName":"", "PIDVarName":"BacPIDK", "Variables":["BacPT","nTracks"]}
-
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID0_Str20.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID0_Str20.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID0_Str20.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID0_Str20.root"}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { "FileName":"",
-                                                                  "WorkName":"workspace", "DataName":"dataSetCombPi_BeautyMass", "Type":"Workspace",
-                                                                  "WeightName":"", "PIDVarName":"BacPIDK", "Variables":["BacPT","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { "FileName":"",
-                                                                  "WorkName":"workspace", "DataName":"dataSetCombPi_BeautyMass", "Type":"Workspace",
-                                                                  "WeightName":"", "PIDVarName":"BacPIDK", "Variables":["BacPT","nTracks"]}
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All": 5.36808e+03}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"All": 3.26424e+01}, "Fixed":True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"All": 1.96670e+01}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"All": 1.93806e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"All":-9.86959e-01}, "Fixed":True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"All": 1.30187e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"All": 1.54147e+01}, "Fixed":True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"All": 5.26116e-01}, "Fixed":True}
-
-    #Signal_BeautyMass_mean   5.36808e+03   4.22811e-01   1.57578e-04   1.13133e-02
-    #Signal_BeautyMass_sigma1_both_kkpi_2012   3.26424e+01   1.10271e+00   9.51084e-05   1.66232e-01
-    #Signal_BeautyMass_sigma2_both_kkpi_2012   1.96670e+01   9.86785e-01   4.97597e-04  -2.10203e-02
-    #Signal_BeautyMass_alpha1_both_kkpi_2012   1.93806e+00   1.22001e-01   1.22765e-04   3.14024e-02
-    #Signal_BeautyMass_alpha2_both_kkpi_2012  -9.86959e-01   1.26994e-01   7.57175e-05   6.40210e-01
-    #Signal_BeautyMass_n1_both_kkpi_2012   1.30187e+00   3.45883e-01   6.36443e-04   4.91274e-02
-    #Signal_BeautyMass_n2_both_kkpi_2012   1.54147e+01   1.48448e+01   2.10941e-03   5.72188e-01
-    #Signal_BeautyMass_frac_both_kkpi_2012   5.26116e-01   5.17726e-02   1.00902e-03   5.22559e-02
-    #nSig_both_kkpi_2012_Evts   1.57160e+04   1.25362e+02   5.63838e-05   4.77518e-02
-
-    # Old values
-    #configdict["BsSignalShape"] = {}
-    #configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    #configdict["BsSignalShape"]["mean"]    = {"Run1": {"All": 5.36878e+03}, "Fixed":False}
-    #configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"All": 2.88070e+01}, "Fixed":True}
-    #configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"All": 1.64247e+01}, "Fixed":True}
-    #configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"All": 1.64214e+00}, "Fixed":True}
-    #configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"All":-2.96373e+00}, "Fixed":True}
-    #configdict["BsSignalShape"]["n1"]      = {"Run1": {"All": 1.26124e+00}, "Fixed":True}
-    #configdict["BsSignalShape"]["n2"]      = {"Run1": {"All": 1.00558e+00}, "Fixed":True}
-    #configdict["BsSignalShape"]["frac"]    = {"Run1": {"All": 3.37315e-01}, "Fixed":True}
-
-    # Ds signal shapes
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All": 2.11000e+03}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"All": 1.20976e+01},  "Fixed":True} 
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"All": 5.94917e+00},  "Fixed":True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"All": 1.40152e+00},  "Fixed":True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"All":-2.98478e-01}, "Fixed":True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"All": 1.44311e+02},  "Fixed":True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"All": 2.83105e+00},  "Fixed":True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"All": 5.66652e-01},  "Fixed":True}
-
-    # combinatorial background              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"] = "RooKeysPdf"
-    configdict["BsCombinatorialShape"]["name"] = {"2012": {"NonRes": "PhysBkgCombPi_BeautyMassPdf_m_both_nonres_2012",
-                                                           "PhiPi":  "PhysBkgCombPi_BeautyMassPdf_m_both_phipi_2012",
-                                                           "KstK":   "PhysBkgCombPi_BeautyMassPdf_m_both_kstk_2012",
-                                                           "KPiPi":  "PhysBkgCombPi_BeautyMassPdf_m_both_kpipi_2012",
-                                                           "PiPiPi": "PhysBkgCombPi_BeautyMassPdf_m_both_pipipi_2012"},
-                                                  "2011": {"NonRes": "PhysBkgCombPi_BeautyMassPdf_m_both_nonres_2011",
-                                                           "PhiPi":  "PhysBkgCombPi_BeautyMassPdf_m_both_phipi_2011",
-                                                           "KstK":   "PhysBkgCombPi_BeautyMassPdf_m_both_kstk_2011",
-                                                           "KPiPi":  "PhysBkgCombPi_BeautyMassPdf_m_both_kpipipi_2011",
-                                                           "PiPiPi": "PhysBkgCombPi_BeautyMassPdf_m_both_pipipi_2011"}}
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" 
-    configdict["DsCombinatorialShape"]["cD"]    = {"Run1": {"NonRes":-0.05, "PhiPi":-0.05, "KstK":-0.05, "KPiPi":-0.05, "PiPiPi":-0.05}, "Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"] = {"Run1": {"NonRes":0.5,   "PhiPi":0.5,   "KstK":0.5,   "KPiPi":0.5,   "PiPiPi":0.5},   "Fixed":False}
-
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]  = { "2011":{"All":0.5}, "2012":{"All":0.5},  "Fixed":False }
-
-    configdict["Bd2Ds(st)XShape"] = {}
-    configdict["Bd2Ds(st)XShape"]["type"]    = "ShiftedSignal"
-    configdict["Bd2Ds(st)XShape"]["decay"]   = "Bd2DsK"
-    configdict["Bd2Ds(st)XShape"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2Ds(st)XShape"]["scale1"]  = {"Run1": {"All": 0.998944636665}, "Fixed":True}
-    configdict["Bd2Ds(st)XShape"]["scale2"]  = {"Run1": {"All": 1.00022181515}, "Fixed":True}
-
-    #expected yields                                                                                                                                                       
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bs2DsstRho"] = {"2012": { "NonRes":5000.0, "PhiPi":5000.0, "KstK":5000.0, "KPiPi":5000.0, "PiPiPi":5000.0},  
-                                          "2011": { "NonRes":5000.0, "PhiPi":5000.0, "KstK":5000.0, "KPiPi":5000.0, "PiPiPi":5000.0}, "Fixed":False}
-    configdict["Yields"]["Bd2DsstPi"]  = {"2012": { "NonRes":0.0, "PhiPi":0.0, "KstK":0.0, "KPiPi":0.0, "PiPiPi":0.0},
-                                          "2011": { "NonRes":0.0, "PhiPi":0.0, "KstK":0.0, "KPiPi":0.0, "PiPiPi":0.0}, "Fixed":False}
-    configdict["Yields"]["Bs2DsRho"]   = {"2012": { "NonRes":5000.0, "PhiPi":5000.0, "KstK":5000.0, "KPiPi":5000.0, "PiPiPi":5000.0},
-                                          "2011": { "NonRes":5000.0, "PhiPi":5000.0, "KstK":5000.0, "KPiPi":5000.0, "PiPiPi":5000.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]    = {"2012": {"NonRes":20000.0, "PhiPi":50000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},
-                                          "2011": {"NonRes":20000.0, "PhiPi":50000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0}, "Fixed":False}
-    configdict["Yields"]["Signal"]     = {"2012": {"NonRes":5000.0, "PhiPi":15000.0, "KstK":5000.0, "KPiPi":5000.0, "PiPiPi":5000.0},
-                                          "2011": {"NonRes":5000.0, "PhiPi":15000.0, "KstK":5000.0, "KPiPi":5000.0, "PiPiPi":5000.0}, "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bd2DsstPi", "Bs2DsRho", "Bs2DsstRho"]
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kBlue-10, kGreen+3]
-    #configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bs2DsRho", "Bs2DsstRho"]
-    #configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kBlue-10, kGreen+3]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66], 
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbBR/Bs2DsstPi/config_Bs2DsstPi.txt b/PhysFit/B2DXFitters/data/Bs2DsstK_3fbBR/Bs2DsstPi/config_Bs2DsstPi.txt
deleted file mode 100644
index a871a6543c81ed8998dece31a9a1833af37147fc..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbBR/Bs2DsstPi/config_Bs2DsstPi.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-
-#Bs2DsstPi NonRes 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt/
-Filter11_Bs2DsstPi_Data_dw.root
-Filter11_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi NonRes 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt/
-Filter12_Bs2DsstPi_Data_dw.root
-Filter12_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstPi NonRes 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt/
-Filter_Bs2DsstPi_Signal_dw.root
-Filter_Bs2DsstPi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstPi NonRes 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt/
-Filter_Bs2DsstPi_Signal_dw.root
-Filter_Bs2DsstPi_Signal_up.root
-tuple
-tuple
-###
-
-#MC FileName KKPi MD 2011
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt/Filter_Bs2DsstPi_Bs2Dsrho_dw.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt/Filter_Bs2DsstPi_Bs2Dsstrho_dw.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
-###
-
-#MC FileName KKPi MU 2011
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt/Filter_Bs2DsstPi_Bs2Dsrho_up.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt/Filter_Bs2DsstPi_Bs2Dsstrho_up.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
-###
-
-#MC FileName KKPi MD 2012
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt/Filter_Bs2DsstPi_Bs2Dsrho_dw.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt/Filter_Bs2DsstPi_Bs2Dsstrho_dw.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
-###
-
-#MC FileName KKPi MU 2012
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt/Filter_Bs2DsstPi_Bs2Dsrho_up.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt/Filter_Bs2DsstPi_Bs2Dsstrho_up.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
-###
-
-#Bs2DsstPi Combinatorial NonRes 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt/
-Filter11_Bs2DsstPi_Data_dw.root
-Filter11_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial NonRes 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt/
-Filter12_Bs2DsstPi_Data_dw.root
-Filter12_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
diff --git a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstK/Bs2DsstKConfigForMCSplineFit.py b/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstK/Bs2DsstKConfigForMCSplineFit.py
deleted file mode 100644
index 0279f899d2c7b822f09e2dd3d374447c5fed9586..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstK/Bs2DsstKConfigForMCSplineFit.py
+++ /dev/null
@@ -1,34 +0,0 @@
-def getconfig() :
-
-    from Bs2DsstKConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Tau_H"] = 1.661000 #1.660999991
-    configdict["Tau_L"] = 1.405000 #1.404999988
-    configdict["Gamma_H"] = 1.0/configdict["Tau_H"]
-    configdict["Gamma_L"] = 1.0/configdict["Tau_L"]
-    configdict["Gammas"]  = (configdict["Gamma_H"] + configdict["Gamma_L"])/2.0
-    configdict["Tau"] = 1.52231245
-    configdict["DeltaGammas"] =  (configdict["Gamma_H"] - configdict["Gamma_L"])
-
-
-    configdict["DeltaMs"]       = 0.0   # in ps^{-1}                                                                                                                                   
-    configdict["cos"] = 0.0
-    configdict["sin"] = 0.0
-    configdict["sinh"] = 0.0
-
-    configdict["Bins"] = 1000
-
-    configdict["CPlimit"]       = {"upper":4.0, "lower":-4.0}
-
-    configdict["Acceptance"] = { "knots":  [0.50,       1.0,        1.5,        2.0,        3.0,        8.0],
-                                 "values": [4.5579e-01, 7.0310e-01, 8.7709e-01, 1.1351e+00, 1.0e+00, 1.0e+00] }
-
-    configdict["Resolution"] = {"scaleFactor":1.201}
-
-    configdict["constParams"] = []
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstK/Bs2DsstKConfigForNominalCPFit.py b/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstK/Bs2DsstKConfigForNominalCPFit.py
deleted file mode 100644
index ba205b65d071a7f4eda7869aa4473c08f4de30c3..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstK/Bs2DsstKConfigForNominalCPFit.py
+++ /dev/null
@@ -1,102 +0,0 @@
-def getconfig() :
-
-    from Bs2DsstKConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]        =  0.6643 #0.0020   # in ps^{-1}
-    configdict["DeltaGammas"]   =  -0.083 #-0.006
-    configdict["DeltaMs"]       = 17.757   # in ps^{-1}
-    configdict["TagEffSig"]     = 0.403
-    configdict["TagOmegaSig"]   = 0.391
-    configdict["StrongPhase"]   = 20. / 180. * pi
-    configdict["WeakPhase"]     = 70./180.*pi
-    configdict["ModLf"]         = 0.372
-    configdict["CPlimit"]       = {"upper":4.0, "lower":-4.0} 
-
-
-    configdict["Asymmetries"] = {"Detection":1.0/100.0,
-                                 "Production":1.1/100.0}
-    configdict["TaggingCalibration"] = {}
-
-    configdict["FixAcceptance"] = True
-    configdict["ConstrainsForTaggingCalib"] = True
-
-    configdict["UsedResolution"] = "Nominal"
-
-    # Nominal Resolution and corresponding tagging parameters
-    configdict["Resolution"] = { "scaleFactor":{"p0":0.010262, "p1":1.280, "p2":0.0},
-                                 "meanBias":0.0,
-                                 "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                            "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                 "templates": { "fileName":"work_templates_dsstk.root",
-                                                "workName":"work",
-                                                "templateName":"TimeErrorPdf_Bs2DsstK"} }
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.44119, "dp0": 0.0, "p1": 1.0868, "dp1": 0.0,
-                                              "cov": [ [2.903e-05, 0.0, 0.0001613, 0.0],
-                                                       [0.0, 1.0, 0.0, 0.0],
-                                                       [0.0001613, 0.0, 0.006101, 0.0],
-                                                       [0.0, 0.0, 0.0, 1.0]],
-                                              "average": 0.43744, "tagEff":0.63926, "aTagEff":0.0, "use":True}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.37718, "dp0": 0.0, "p1": 1.1244, "dp1": 0.0,
-                                              "cov": [ [5.212e-05, 0.0, 0.0002286, 0.0],
-                                                       [0.0, 1.0, 0.0, 0.0],
-                                                       [0.0002286, 0.0, 0.006685, 0.0],
-                                                       [0.0, 0.0, 0.0, 1.0]],
-                                              "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-
-    #configdict["Acceptance"] = { "knots":  [0.50,       1.0,        1.5,        2.0,        3.0,        10.0],
-    #                             "values": [4.5579e-01, 7.0310e-01, 8.7709e-01, 1.1351e+00, 1.0e+00, 1.0e+00] }
-
-    configdict["Acceptance"] = { "knots":   [0.50, 1.0, 2.0, 3.0, 10.0],
-                                  "values": [1.2001, 1.8838, 2.4221, 3.4077, 2.6101] }
-    #configdict["Acceptance"] = { "knots":  [0.50,       1.5,        3.0,        10.0],
-    #                             "values": [4.5579e-01, 1.1351e+00, 1.0e+00, 1.0e+00] }
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas_Bs2DsstK')
-    configdict["constParams"].append('deltaGammas_Bs2DsstK')
-    #configdict["constParams"].append('C_Bs2DsstK')
-    #configdict["constParams"].append('Cbar_Bs2DsstK')
-    #configdict["constParams"].append('S_Bs2DsstK')
-    #configdict["constParams"].append('Sbar_Bs2DsstK')
-    #configdict["constParams"].append('D_Bs2DsstK')
-    #configdict["constParams"].append('Dbar_Bs2DsstK')
-    configdict["constParams"].append('tagEff_OS')
-    configdict["constParams"].append('tagEff_SS')
-    configdict["constParams"].append('tagEff_Both')
-    configdict["constParams"].append('aTagEff_OS')
-    configdict["constParams"].append('aTagEff_SS')
-    configdict["constParams"].append('aTagEff_Both')
-    if configdict["FixAcceptance"] == True:
-        configdict["constParams"].append('var1')
-        configdict["constParams"].append('var2')
-        configdict["constParams"].append('var3')
-        configdict["constParams"].append('var4')
-        configdict["constParams"].append('var5')
-        configdict["constParams"].append('var6')
-        configdict["constParams"].append('var7')
-    if configdict["ConstrainsForTaggingCalib"] == False:
-        configdict["constParams"].append('p0_OS')
-        configdict["constParams"].append('p0_SS')
-        configdict["constParams"].append('p1_OS')
-        configdict["constParams"].append('p1_SS')
-    configdict["constParams"].append('dp0_OS')
-    configdict["constParams"].append('dp0_SS')
-    configdict["constParams"].append('dp1_OS')
-    configdict["constParams"].append('dp1_SS')
-    configdict["constParams"].append('p0_mean_OS')
-    configdict["constParams"].append('p0_mean_SS')
-    configdict["constParams"].append('p1_mean_OS')
-    configdict["constParams"].append('p1_mean_SS')
-    configdict["constParams"].append('dp0_mean_OS')
-    configdict["constParams"].append('dp0_mean_SS')
-    configdict["constParams"].append('dp1_mean_OS')
-    configdict["constParams"].append('dp1_mean_SS')
-    configdict["constParams"].append('average_OS')
-    configdict["constParams"].append('average_SS')
-    configdict["constParams"].append('DeltaMs_Bs2DsstK')
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstK/Bs2DsstKConfigForNominalMassFit.py b/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstK/Bs2DsstKConfigForNominalMassFit.py
deleted file mode 100644
index 64f28564558a530f7396589dbff3fb53427d02c7..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstK/Bs2DsstKConfigForNominalMassFit.py
+++ /dev/null
@@ -1,243 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bs2DsstK"
-    configdict["CharmModes"] = {"NonRes", "PhiPi", "KstK", "KPiPi", "PiPiPi"}
-    configdict["Backgrounds"] = ["Bs2DsRho","Bs2DsstRho","Bs2DsstPi","Bd2DsstK","Bs2DsKst","Bd2DsKst","Bs2DsstKst","Bd2DsstKst"]
-    # year of data taking                                                                                 
-    configdict["YearOfDataTaking"] = {"2012", "2011"}
-    # stripping (necessary in case of PIDK shapes)                               
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)
-    configdict["IntegratedLuminosity"] = {"2011":{"Down": 0.57, "Up": 0.43}, "2012":{"Down": 0.9894, "Up": 0.9985}} 
-    # file name with paths to MC/data samples                                     
-    configdict["dataName"]   = "../data/Bs2DsstK_3fbCPV/Bs2DsstK/config_Bs2DsstK.txt"
-
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsstK", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5100,    6000    ], "InputName" : "FBs_DeltaM_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [2080,    2150    ], "InputName" : "FDsstr_DeltaM_M"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     12.0    ], "InputName" : "FBs_LF_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [1000.,   650000.0], "InputName" : "FBac_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [1000.,   45000.0 ], "InputName" : "FBac_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [1.61,    5.0     ], "InputName" : "FBac_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.,     1000.0  ], "InputName" : "FnTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "FBs_LF_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "FBac_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.025,   1.0     ], "InputName" : "FBDT_Var"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "FBs_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "FBs_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [0.0,     0.5     ], "InputName" : "FBs_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [0.0,     0.5     ], "InputName" : "FBs_SS_nnetKaon_PROB"}
-
-    # tagging calibration                                                                                               
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3834, "p1": 0.9720, "average": 0.3813}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4244, "p1": 1.2180, "average": 0.4097}
-
-    # additional cuts applied to data sets
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = {"Data": "FDs_M>1950.&&FDs_M<1990.&&FDs_FDCHI2_ORIVX>2.&&FDelta_M>111.5&&FDelta_M<181.5&&FBs_Veto==0.&&FBDT_Var>0.025",
-                                              "MC":   "FDs_M>1950.&&FDs_M<1990.&&FDs_FDCHI2_ORIVX>2.&&FDelta_M>111.5&&FDelta_M<181.5&&FBs_Veto==0.&&FBDT_Var>0.025"}
-    configdict["AdditionalCuts"]["NonRes"] = {"Data":"FDs_Dec==3", "MC":"FDs_Dec==3"}
-    configdict["AdditionalCuts"]["PhiPi"]  = {"Data":"FDs_Dec==1", "MC":"FDs_Dec==1"}
-    configdict["AdditionalCuts"]["KstK"]   = {"Data":"FDs_Dec==2", "MC":"FDs_Dec==2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = {"Data":"FDs_Dec==5&&FDs_FDCHI2_ORIVX>9.&&FPi_PIDK>10.&&FKp_PIDK<0.&&FKm_PIDK<0.&&FKst_M<1750.",
-                                              "MC":  "FDs_Dec==5&&FDs_FDCHI2_ORIVX>9.&&FKst_M<1750."}
-    configdict["AdditionalCuts"]["PiPiPi"] = {"Data":"FDs_Dec==4&&FDs_FDCHI2_ORIVX>9.&&FKp_PIDK<0.&&FKm_PIDK<0.&&FPi_PIDK<0.&&(FPhi_M<1700.&&FKst_M<1700.)", 
-                                              "MC":  "FDs_Dec==4&&FDs_FDCHI2_ORIVX>9.&&(FPhi_M<1700.&&FKst_M<1700.)"}
- 
-    configdict["CreateCombinatorial"] = {}
-    configdict["CreateCombinatorial"]["BeautyMass"] = {} 
-    configdict["CreateCombinatorial"]["BeautyMass"]["All"]    = {"Cut":"FBs_DeltaM_M>5100&&FBs_DeltaM_M<6000&&FDs_M>1950.&&FDs_M<1990.&&FDs_FDCHI2_ORIVX>2.&&FDelta_M>185.&&FDelta_M<205.&&FBs_Veto==0.&&FBDT_Var>0.025&&FBac_P>1000.0&&FBac_P<650000.0&&FBac_PT>1000.0&&FBac_PT<45000.0",
-                                                                 "Rho":2.5, "Mirror":"Both"}
-    configdict["CreateCombinatorial"]["BeautyMass"]["NonRes"] = {"Cut":"FDs_Dec==3"}
-    configdict["CreateCombinatorial"]["BeautyMass"]["PhiPi"]  = {"Cut":"FDs_Dec==1"}
-    configdict["CreateCombinatorial"]["BeautyMass"]["KstK"]   = {"Cut":"FDs_Dec==2"}
-    configdict["CreateCombinatorial"]["BeautyMass"]["KPiPi"]  = {"Cut":"FDs_Dec==5&&FDs_FDCHI2_ORIVX>9.&&FPi_PIDK>10.&&FKp_PIDK<0.&&FKm_PIDK<0.&&FKst_M<1750."}
-    configdict["CreateCombinatorial"]["BeautyMass"]["PiPiPi"] = {"Cut":"FDs_Dec==4&&FDs_FDCHI2_ORIVX>9.&&FKp_PIDK<0.&&FKm_PIDK<0.&&FPi_PIDK<0.&&(FPhi_M<1700.&&FKst_M<1700.)"}
-
-    #weighting for PID templates
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[20,20] }
-    #configdict["WeightingMassTemplates"]= { "RatioDataMC":True }
-
-    #PID Calibration samples for PID shapes
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID5_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID5_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID5_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID5_Str21r1.root"}
-
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsK_Run1_BDTG3.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2011", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsK_Run1_BDTG3.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2011", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-    #configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { "FileName":"",
-    #                                                              "WorkName":"workspace", "DataName":"dataSetCombK_BeautyMass", "Type":"Workspace",
-    #                                                              "WeightName":"", "PIDVarName":"BacPIDK", "Variables":["BacPT","nTracks"]}
-    #configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { "FileName":"",
-    #                                                              "WorkName":"workspace", "DataName":"dataSetCombK_BeautyMass", "Type":"Workspace",
-    #                                                              "WeightName":"", "PIDVarN
-
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID5_Str20.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID5_Str20.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID5_Str20.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID5_Str20.root"}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsK_Run1_BDTG3.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2012", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/user/g/gtellari/public/Bs2DsK_3fb/BDTG3/Comb_PID/work_Comb_DsK_Run1_BDTG3.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2012", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-    #configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { "FileName":"",
-    #                                                              "WorkName":"workspace", "DataName":"dataSetCombK_BeautyMass", "Type":"Workspace",
-    #                                                              "WeightName":"", "PIDVarName":"BacPIDK", "Variables":["BacPT","nTracks"]}
-    #configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { "FileName":"",
-    #                                                              "WorkName":"workspace", "DataName":"dataSetCombK_BeautyMass", "Type":"Workspace",
-    #                                                              "WeightName":"", "PIDVarName":"BacPIDK", "Variables":["BacPT","nTracks"]}
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All": 5.36878e+03}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"All": 2.88070e+01}, "Fixed":True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"All": 1.64247e+01}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"All": 1.64214e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"All":-2.96373e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"All": 1.26124e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"All": 1.00558e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"All": 3.37315e-01}, "Fixed":True}
-    configdict["BsSignalShape"]["R"]    =    {"Run1": {"All": 1.},         "Fixed":False}
-    
-    # Ds signal shapes
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All": 2.11000e+03}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"All": 1.20976e+01},  "Fixed":True} 
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"All": 5.94917e+00},  "Fixed":True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"All": 1.40152e+00},  "Fixed":True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"All":-2.98478e-01}, "Fixed":True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"All": 1.44311e+02},  "Fixed":True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"All": 2.83105e+00},  "Fixed":True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"All": 5.66652e-01},  "Fixed":True}
-    configdict["DsSignalShape"]["R"]    =    {"Run1": {"All": 1.},         "Fixed":False}
-
-    # combinatorial background              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"] = "RooKeysPdf"
-    configdict["BsCombinatorialShape"]["name"] = {"2012": {"NonRes": "PhysBkgCombK_BeautyMassPdf_m_both_nonres_2012",
-                                                           "PhiPi":  "PhysBkgCombK_BeautyMassPdf_m_both_phipi_2012",
-                                                           "KstK":   "PhysBkgCombK_BeautyMassPdf_m_both_kstk_2012",
-                                                           "KPiPi":  "PhysBkgCombK_BeautyMassPdf_m_both_kpipi_2012",
-                                                           "PiPiPi": "PhysBkgCombK_BeautyMassPdf_m_both_pipipi_2012"},
-                                                  "2011": {"NonRes": "PhysBkgCombK_BeautyMassPdf_m_both_nonres_2011",
-                                                           "PhiPi":  "PhysBkgCombK_BeautyMassPdf_m_both_phipi_2011",
-                                                           "KstK":   "PhysBkgCombK_BeautyMassPdf_m_both_kstk_2011",
-                                                           "KPiPi":  "PhysBkgCombK_BeautyMassPdf_m_both_kpipi_2011",
-                                                           "PiPiPi": "PhysBkgCombK_BeautyMassPdf_m_both_pipipi_2011"}}
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" 
-    configdict["DsCombinatorialShape"]["cD"]    = {"Run1": {"NonRes":-0.05, "PhiPi":-0.05, "KstK":-0.05, "KPiPi":-0.05, "PiPiPi":-0.05}, "Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"] = {"Run1": {"NonRes":0.5,   "PhiPi":0.5,   "KstK":0.5,   "KPiPi":1.0,   "PiPiPi":1.0},   "Fixed":{"KPiPi":True, "PiPiPi":True}}
-
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "Run1":{"All":0.7}, "Fixed":False }
-
-    configdict["Bd2DsstKShape"] = {}
-    configdict["Bd2DsstKShape"]["BeautyMass"] = {}
-    configdict["Bd2DsstKShape"]["BeautyMass"]["type"]    = "ShiftedSignal"
-    configdict["Bd2DsstKShape"]["BeautyMass"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2DsstKShape"]["BeautyMass"]["scale1"]  = {"Run1": {"All": 1.0}, "Fixed":True}
-    configdict["Bd2DsstKShape"]["BeautyMass"]["scale2"]  = {"Run1": {"All": 1.0}, "Fixed":True}
-
-
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.6, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g1_f2_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.4,  "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g2_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.7,  "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g3_f1_frac"] = {"Run1":{"All":{"Both":{ "CentralValue":0.7,  "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g3_f2_frac"] = {"Run1":{"NonRes":{"Both":{ "CentralValue":0.6,  "Range":[0.0,1.0]}},
-                                                                "PhiPi":{"Both":{ "CentralValue":0.6,  "Range":[0.0,1.0]}},
-                                                                "KstK":{"Both":{ "CentralValue":0.6,  "Range":[0.0,1.0]}},
-                                                                "KPiPi":{"Both":{ "CentralValue":0.6,  "Range":[0.0,1.0]}},
-                                                                "PiPiPi":{"Both":{ "CentralValue":0.6,  "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g4_f1_frac"] = {"Run1":{"NonRes":{"Both":{ "CentralValue":0.8, "Range":[0.5,1.0]}}, 
-                                                                "PhiPi":{"Both":{ "CentralValue":0.8, "Range":[0.5,1.0]}},
-                                                                "KstK":{"Both":{ "CentralValue":0.8, "Range":[0.5,1.0]}},
-                                                                "KPiPi":{"Both":{ "CentralValue":0.8, "Range":[0.5,1.0]}},
-                                                                "PiPiPi":{"Both":{ "CentralValue":0.8, "Range":[0.5,1.0]}}}, "Fixed":False}
-
-    #expected yields                                                                                                                                                       
-    configdict["Yields"] = {}
-    #configdict["Yields"]["Bs2DsDsstRho"]   = {"Run1": {"NonRes":1000.0, "PhiPi":1000.0, "KstK":1000.0, "KPiPi":1000.0, "PiPiPi":100.0},  "Fixed":False}
-    #configdict["Yields"]["Bd2DsstK"]       = {"Run1": {"NonRes":150.0,  "PhiPi":150.0,  "KstK":150.0,  "KPiPi":150.0,  "PiPiPi":150.0},  "Fixed":False}
-    #configdict["Yields"]["Bs2DsstPi"]      = {"Run1": {"NonRes":500.0,  "PhiPi":500.0,  "KstK":500.0,  "KPiPi":500.0,  "PiPiPi":500.0},  "Fixed":False}
-    #configdict["Yields"]["BsBd2DsKst"]     = {"Run1": {"NonRes":100.0,  "PhiPi":100.0,  "KstK":100.0,  "KPiPi":100.0,  "PiPiPi":100.0},  "Fixed":False}
-    #configdict["Yields"]["BsBd2DsstKst"]   = {"Run1": {"NonRes":700.0,  "PhiPi":700.0,  "KstK":700.0,  "KPiPi":700.0,  "PiPiPi":700.0},  "Fixed":False}
-    #configdict["Yields"]["CombBkg"]        = {"Run1": {"NonRes":2000.0, "PhiPi":1500.0, "KstK":1500.0, "KPiPi":1500.0, "PiPiPi":1500.0}, "Fixed":False}
-    #configdict["Yields"]["Signal"]         = {"Run1": {"NonRes":1000.0, "PhiPi":1000.0, "KstK":1000.0, "KPiPi":1000.0, "PiPiPi":1000.0}, "Fixed":False}
-
-    configdict["Yields"]["Bs2DsDsstRho"]   = {"2012": {"NonRes":500.0,  "PhiPi":500.0,  "KstK":500.0,  "KPiPi":500.0,  "PiPiPi":500.0},  
-                                              "2011": {"NonRes":500.0,  "PhiPi":500.0,  "KstK":500.0,  "KPiPi":500.0,  "PiPiPi":500.0}, "Fixed":False}
-    configdict["Yields"]["Bd2DsstK"]       = {"2012": {"NonRes":150.0,  "PhiPi":150.0,  "KstK":100.0,  "KPiPi":50.0,   "PiPiPi":50.0},
-                                              "2011": {"NonRes":150.0,  "PhiPi":150.0,  "KstK":100.0,  "KPiPi":50.0,   "PiPiPi":50.0}, "Fixed":False}
-    configdict["Yields"]["Bs2DsstPi"]      = {"2012": {"NonRes":500.0,  "PhiPi":500.0,  "KstK":500.0,  "KPiPi":500.0,  "PiPiPi":500.0},
-                                              "2011": {"NonRes":500.0,  "PhiPi":500.0,  "KstK":500.0,  "KPiPi":500.0,  "PiPiPi":500.0}, "Fixed":False}
-    configdict["Yields"]["BsBd2DsKst"]     = {"2012": {"NonRes":500.0,  "PhiPi":500.0,  "KstK":500.0,  "KPiPi":500.0,  "PiPiPi":500.0},
-                                              "2011": {"NonRes":500.0,  "PhiPi":500.0,  "KstK":500.0,  "KPiPi":500.0,  "PiPiPi":500.0}, "Fixed":False}
-    configdict["Yields"]["BsBd2DsstKst"]   = {"2012": {"NonRes":500.0,  "PhiPi":500.0,  "KstK":500.0,  "KPiPi":500.0,  "PiPiPi":500.0},
-                                              "2011": {"NonRes":500.0,  "PhiPi":500.0,  "KstK":500.0,  "KPiPi":500.0,  "PiPiPi":500.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]        = {"2012": {"NonRes":5000.0, "PhiPi":5000.0, "KstK":5000.0, "KPiPi":5000.0, "PiPiPi":5000.0},
-                                              "2011": {"NonRes":5000.0, "PhiPi":5000.0, "KstK":5000.0, "KPiPi":5000.0, "PiPiPi":5000.0}, "Fixed":False}
-    configdict["Yields"]["Signal"]         = {"2012": {"NonRes":1000.0, "PhiPi":1000.0, "KstK":1000.0, "KPiPi":1000.0, "PiPiPi":1000.0},
-                                              "2011": {"NonRes":1000.0, "PhiPi":1000.0, "KstK":1000.0, "KPiPi":1000.0, "PiPiPi":1000.0}, "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bs2DsDsstRho", "BsBd2DsstKst", "Bd2DsstK"]
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kMagenta-2, kBlue-10, kRed+1, kBlue+2]
-    #configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bs2DsRho", "Bs2DsstRho"]
-    #configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kBlue-10, kGreen+3]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.75, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.7,0.9], 
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstK/Bs2DsstKConfigGlobal.py b/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstK/Bs2DsstKConfigGlobal.py
deleted file mode 100644
index 85f4da5423fcaf3318de1ffb17c5725c042f80f8..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstK/Bs2DsstKConfigGlobal.py
+++ /dev/null
@@ -1,36 +0,0 @@
-def getconfig():
-    configdict = {}
-	# 1 No Weights
-#    configdict["GlobalWeight"] = {"2011": {"NonRes": {"Down": 0.497300, "Up": 0.385106},
-#                                               "PhiPi" : {"Down": 0.848852, "Up": 0.670211},
-#                                               "KstK"  : {"Down": 0.766982, "Up": 0.595876},
-#                                               "KPiPi" : {"Down": 0.440421, "Up": 0.300269},
-#                                               "PiPiPi": {"Down": 0.483716, "Up": 0.718091}},
-#                                    "2012": {"NonRes": {"Down": 0.584562, "Up": 0.592608},
-#                                               "PhiPi" : {"Down": 0.974114, "Up": 1.000000},
-#                                               "KstK"  : {"Down": 0.923757, "Up": 0.940439},
-#                                               "KPiPi" : {"Down": 0.499114, "Up": 0.476361},
-#                                               "PiPiPi": {"Down": 0.885884, "Up": 0.956811}}}
-	# 2 DPi Weights
-#    configdict["GlobalWeight"] = {"2011": {"NonRes": {"Down": 0.498773, "Up": 0.381535},
-#                                               "PhiPi" : {"Down": 0.850307, "Up": 0.665898},
-#                                               "KstK"  : {"Down": 0.775542, "Up": 0.599347},
-#                                               "KPiPi" : {"Down": 0.444178, "Up": 0.303590},
-#                                               "PiPiPi": {"Down": 0.487857, "Up": 0.724080}},
-#                                    "2012": {"NonRes": {"Down": 0.583234, "Up": 0.593709},
-#                                               "PhiPi" : {"Down": 0.966443, "Up": 1.000000},
-#                                               "KstK"  : {"Down": 0.920000, "Up": 0.946439},
-#                                               "KPiPi" : {"Down": 0.496693, "Up": 0.480096},
-#                                               "PiPiPi": {"Down": 0.883657, "Up": 0.967927}}}
-	# 3 DsstPi Weights
-    configdict["GlobalWeight"] = {"2011": {"NonRes": {"Down": 0.587016, "Up": 0.447754},
-                                               "PhiPi" : {"Down": 1.000000, "Up": 0.778637},
-                                               "KstK"  : {"Down": 0.913067, "Up": 0.705025},
-                                               "KPiPi" : {"Down": 0.528173, "Up": 0.360441},
-                                               "PiPiPi": {"Down": 0.575868, "Up": 0.847571}},
-                                    "2012": {"NonRes": {"Down": 0.421325, "Up": 0.426633},
-                                               "PhiPi" : {"Down": 0.698227, "Up": 0.716946},
-                                               "KstK"  : {"Down": 0.666981, "Up": 0.682600},
-                                               "KPiPi" : {"Down": 0.359885, "Up": 0.347029},
-                                               "PiPiPi": {"Down": 0.636312, "Up": 0.700813}}}
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstK/config_Bs2DsstK.txt b/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstK/config_Bs2DsstK.txt
deleted file mode 100644
index 1dfc212d794d00c134aa882b4b9a68c73c4e5074..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstK/config_Bs2DsstK.txt
+++ /dev/null
@@ -1,390 +0,0 @@
-
-#Bs2DsstK KKPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK_Data_dw.root
-Filter12-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK NonRes 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK_Data_dw.root
-Filter11-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK NonRes 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK_Data_dw.root
-Filter12-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK PhiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK_Data_dw.root
-Filter11-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK PhiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK_Data_dw.root
-Filter12-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK KstK 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK_Data_dw.root
-Filter11-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK KstK 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK_Data_dw.root
-Filter12-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK KPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK-K2Pi_Data_dw.root
-Filter11-s21_Bs2DsstK-K2Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK KPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK-K2Pi_Data_dw.root
-Filter12-s21_Bs2DsstK-K2Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK PiPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK-3Pi_Data_dw.root
-Filter11-s21_Bs2DsstK-3Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK PiPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK-3Pi_Data_dw.root
-Filter12-s21_Bs2DsstK-3Pi_Data_up.root
-tuple
-tuple
-###
-
-#RatioDataMC2D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-MomVsnTr_Comp_DPi_Down_hist.root
-MomVsnTr_Comp_DPi_Up_hist.root
-###
-
-#MC FileName KKPi MD 2012
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsrho_dw.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstrho_dw.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
- {"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstpi_dw.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bd2DsstK",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bd2Dsstk_dw.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bs2DsKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dskst_dw.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bd2DsKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dskst_dw.root",
- "TreeName":"tuple;1"}
-  {"Mode":"Bs2DsstKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstkst_dw.root",
- "TreeName":"tuple;1"}
-  {"Mode":"Bd2DsstKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstkst_dw.root",
- "TreeName":"tuple;1"}
-###
-
-#MC FileName KKPi MU 2012
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsrho_up.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstrho_up.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
-  {"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstpi_up.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bd2DsstK",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bd2Dsstk_up.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bs2DsKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dskst_up.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bd2DsKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dskst_up.root",
- "TreeName":"tuple;1"}
-  {"Mode":"Bs2DsstKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstkst_up.root",
- "TreeName":"tuple;1"}
-  {"Mode":"Bd2DsstKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstkst_up.root",
- "TreeName":"tuple;1"}
-###
-
-#MC FileName KKPi MD 2011
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsrho_dw.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstrho_dw.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
-  {"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstpi_dw.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bd2DsstK",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bd2Dsstk_dw.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bs2DsKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dskst_dw.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bd2DsKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dskst_dw.root",
- "TreeName":"tuple;1"}
-  {"Mode":"Bs2DsstKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstkst_dw.root",
- "TreeName":"tuple;1"}
-  {"Mode":"Bd2DsstKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstkst_dw.root",
- "TreeName":"tuple;1"}
-###
-
-#MC FileName KKPi MU 2011
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsrho_up.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstrho_up.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
-  {"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstpi_up.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bd2DsstK",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bd2Dsstk_up.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bs2DsKst", 
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dskst_up.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bd2DsKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dskst_up.root",
- "TreeName":"tuple;1"}
-  {"Mode":"Bs2DsstKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstkst_up.root",
- "TreeName":"tuple;1"}
-  {"Mode":"Bd2DsstKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstkst_up.root",
- "TreeName":"tuple;1"}
-###
-
-#Signal Bs2DsstK KKPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter-s21filtered_Bs2DsstK_Signal_dw.root
-Filter-s21filtered_Bs2DsstK_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstK NonRes 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter-s21filtered_Bs2DsstK_Signal_dw.root
-Filter-s21filtered_Bs2DsstK_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstK PhiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter-s21filtered_Bs2DsstK_Signal_dw.root
-Filter-s21filtered_Bs2DsstK_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstK KstK 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter-s21filtered_Bs2DsstK_Signal_dw.root
-Filter-s21filtered_Bs2DsstK_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstK KPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter-s21filtered_Bs2DsstK-K2Pi_Signal_dw.root
-Filter-s21filtered_Bs2DsstK-K2Pi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstK PiPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter-s21filtered_Bs2DsstK-3Pi_Signal_dw.root
-Filter-s21filtered_Bs2DsstK-3Pi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstK NonRes 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21filtered_Bs2DsstK_Signal_dw.root
-Filter11-s21filtered_Bs2DsstK_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstK PhiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21filtered_Bs2DsstK_Signal_dw.root
-Filter11-s21filtered_Bs2DsstK_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstK KstK 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21filtered_Bs2DsstK_Signal_dw.root
-Filter11-s21filtered_Bs2DsstK_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstK KPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21filtered_Bs2DsstK-K2Pi_Signal_dw.root
-Filter11-s21filtered_Bs2DsstK-K2Pi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstK PiPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21filtered_Bs2DsstK-3Pi_Signal_dw.root
-Filter11-s21filtered_Bs2DsstK-3Pi_Signal_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial KKPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK_Data_dw.root
-Filter11-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial KKPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK_Data_dw.root
-Filter12-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial NonRes 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK_Data_dw.root
-Filter11-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial NonRes 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK_Data_dw.root
-Filter12-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial PhiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK_Data_dw.root
-Filter11-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial PhiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK_Data_dw.root
-Filter12-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial KstK 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK_Data_dw.root
-Filter11-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial KstK 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK_Data_dw.root
-Filter12-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial KPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK-K2Pi_Data_dw.root
-Filter11-s21_Bs2DsstK-K2Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial KPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK-K2Pi_Data_dw.root
-Filter12-s21_Bs2DsstK-K2Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial PiPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK-3Pi_Data_dw.root
-Filter11-s21_Bs2DsstK-3Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial PiPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK-3Pi_Data_dw.root
-Filter12-s21_Bs2DsstK-3Pi_Data_up.root
-tuple
-tuple
-###
diff --git a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstK/config_Bs2DsstK_shunan.txt b/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstK/config_Bs2DsstK_shunan.txt
deleted file mode 100644
index 15acd25af12722c479db3e5a742a4fe946951232..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstK/config_Bs2DsstK_shunan.txt
+++ /dev/null
@@ -1,463 +0,0 @@
-
-#Bs2DsstK KKPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK_Data_dw.root
-Filter12-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK NonRes 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK_Data_dw.root
-Filter11-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK NonRes 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK_Data_dw.root
-Filter12-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK PhiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK_Data_dw.root
-Filter11-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK PhiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK_Data_dw.root
-Filter12-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK KstK 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK_Data_dw.root
-Filter11-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK KstK 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK_Data_dw.root
-Filter12-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK KPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK-K2Pi_Data_dw.root
-Filter11-s21_Bs2DsstK-K2Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK KPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK-K2Pi_Data_dw.root
-Filter12-s21_Bs2DsstK-K2Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK PiPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK-3Pi_Data_dw.root
-Filter11-s21_Bs2DsstK-3Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK PiPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK-3Pi_Data_dw.root
-Filter12-s21_Bs2DsstK-3Pi_Data_up.root
-tuple
-tuple
-###
-
-#RatioDataMC2D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-MomVsnTr_Comp_DPi_Down_hist.root
-MomVsnTr_Comp_DPi_Up_hist.root
-###
-
-#RatioDataMC 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/
-MomVsnTr_Comp_DPi_2011_dw_hist.root
-MomVsnTr_Comp_DPi_2011_up_hist.root
-###
-
-#RatioDataMC 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/
-MomVsnTr_Comp_DPi_2012_dw_hist.root
-MomVsnTr_Comp_DPi_2012_up_hist.root
-###
-
-#RatioDataMC 2011 PNTr
-/afs/cern.ch/work/s/shunan/public/Bs2DsstK/dataMC/
-dataMC_DsstPi_2011_dw.root
-dataMC_DsstPi_2011_up.root
-###
-
-#RatioDataMC 2012 PNTr
-/afs/cern.ch/work/s/shunan/public/Bs2DsstK/dataMC/
-dataMC_DsstPi_2012_dw.root
-dataMC_DsstPi_2012_up.root
-###
-
-
-#RatioDataMC 2011 PTnTr
-/afs/cern.ch/work/s/shunan/public/Bs2DsstK/dataMC/
-dataMC_DsstPi_PTnTr_2011_dw.root
-dataMC_DsstPi_PTnTr_2011_up.root
-###
-
-#RatioDataMC 2012 PTnTr
-/afs/cern.ch/work/s/shunan/public/Bs2DsstK/dataMC/
-dataMC_DsstPi_PTnTr_2012_dw.root
-dataMC_DsstPi_PTnTr_2012_up.root
-###
-
-#MC FileName KKPi MD 2012
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsrho_dw.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstrho_dw.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
- {"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstpi_dw.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bd2DsstK",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bd2Dsstk_dw.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bs2DsKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dskst_dw.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bd2DsKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dskst_dw.root",
- "TreeName":"tuple;1"}
-  {"Mode":"Bs2DsstKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstkst_dw.root",
- "TreeName":"tuple;1"}
-  {"Mode":"Bd2DsstKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstkst_dw.root",
- "TreeName":"tuple;1"}
-###
-
-#MC FileName KKPi MU 2012
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsrho_up.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstrho_up.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
-  {"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstpi_up.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bd2DsstK",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bd2Dsstk_up.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bs2DsKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dskst_up.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bd2DsKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dskst_up.root",
- "TreeName":"tuple;1"}
-  {"Mode":"Bs2DsstKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstkst_up.root",
- "TreeName":"tuple;1"}
-  {"Mode":"Bd2DsstKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstkst_up.root",
- "TreeName":"tuple;1"}
-###
-
-#MC FileName KKPi MD 2011
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsrho_dw.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstrho_dw.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
-  {"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstpi_dw.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bd2DsstK",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bd2Dsstk_dw.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bs2DsKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dskst_dw.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bd2DsKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dskst_dw.root",
- "TreeName":"tuple;1"}
-  {"Mode":"Bs2DsstKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstkst_dw.root",
- "TreeName":"tuple;1"}
-  {"Mode":"Bd2DsstKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstkst_dw.root",
- "TreeName":"tuple;1"}
-###
-
-#MC FileName KKPi MU 2011
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsrho_up.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstrho_up.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
-  {"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstpi_up.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bd2DsstK",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bd2Dsstk_up.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bs2DsKst", 
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dskst_up.root",
- "TreeName":"tuple;1"}
- {"Mode":"Bd2DsKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dskst_up.root",
- "TreeName":"tuple;1"}
-  {"Mode":"Bs2DsstKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstkst_up.root",
- "TreeName":"tuple;1"}
-  {"Mode":"Bd2DsstKst",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/Filter-s21_Bs2DsstK_Bs2Dsstkst_up.root",
- "TreeName":"tuple;1"}
-###
-
-#Signal Bs2DsstK KKPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21_def/
-Filter-s21filtered_Bs2DsstKCPVless_Signal_local_dw.root
-Filter-s21filtered_Bs2DsstKCPVless_Signal_local_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstK NonRes 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21_def/
-Filter-s21filtered_Bs2DsstKCPVless_Signal_local_dw.root
-Filter-s21filtered_Bs2DsstKCPVless_Signal_local_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstK PhiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21_def/
-Filter-s21filtered_Bs2DsstKCPVless_Signal_local_dw.root
-Filter-s21filtered_Bs2DsstKCPVless_Signal_local_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstK KstK 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21_def/
-Filter-s21filtered_Bs2DsstKCPVless_Signal_local_dw.root
-Filter-s21filtered_Bs2DsstKCPVless_Signal_local_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstK KPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21_def/
-Filter-s21filtered_Bs2DsstKCPVless-K2Pi_Signal_local_dw.root
-Filter-s21filtered_Bs2DsstKCPVless-K2Pi_Signal_local_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstK PiPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21_def/
-Filter-s21filtered_Bs2DsstKCPVless-3Pi_Signal_local_dw.root
-Filter-s21filtered_Bs2DsstKCPVless-3Pi_Signal_local_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstK NonRes 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21_def/
-Filter11-s21filtered_Bs2DsstKCPVless_Signal_local_dw.root
-Filter11-s21filtered_Bs2DsstKCPVless_Signal_local_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstK PhiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21_def/
-Filter11-s21filtered_Bs2DsstKCPVless_Signal_local_dw.root
-Filter11-s21filtered_Bs2DsstKCPVless_Signal_local_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstK KstK 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21_def/
-Filter11-s21filtered_Bs2DsstKCPVless_Signal_local_dw.root
-Filter11-s21filtered_Bs2DsstKCPVless_Signal_local_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstK KPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21_def/
-Filter11-s21filtered_Bs2DsstKCPVless-K2Pi_Signal_local_dw.root
-Filter11-s21filtered_Bs2DsstKCPVless-K2Pi_Signal_local_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstK PiPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21_def/
-Filter11-s21filtered_Bs2DsstKCPVless-3Pi_Signal_local_dw.root
-Filter11-s21filtered_Bs2DsstKCPVless-3Pi_Signal_local_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial KKPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK_Data_dw.root
-Filter11-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial KKPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK_Data_dw.root
-Filter12-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial NonRes 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK_Data_dw.root
-Filter11-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial NonRes 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK_Data_dw.root
-Filter12-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial PhiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK_Data_dw.root
-Filter11-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial PhiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK_Data_dw.root
-Filter12-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial KstK 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK_Data_dw.root
-Filter11-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial KstK 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK_Data_dw.root
-Filter12-s21_Bs2DsstK_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial KPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK-K2Pi_Data_dw.root
-Filter11-s21_Bs2DsstK-K2Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial KPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK-K2Pi_Data_dw.root
-Filter12-s21_Bs2DsstK-K2Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial PiPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter11-s21_Bs2DsstK-3Pi_Data_dw.root
-Filter11-s21_Bs2DsstK-3Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstK Combinatorial PiPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrK/bdt-s21/
-Filter12-s21_Bs2DsstK-3Pi_Data_dw.root
-Filter12-s21_Bs2DsstK-3Pi_Data_up.root
-tuple
-tuple
-###
-
-#PIDK Pion 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21r1_2011_MagDown_nTracks_P.root
-Pi_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Pion 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21_2012_MagDown_nTracks_P.root
-Pi_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21r1_2011_MagDown_nTracks_P.root
-K_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21_2012_MagDown_nTracks_P.root
-K_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Proton 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21r1_2011_MagDown_nTracks_P.root
-P_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Proton 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21_2012_MagDown_nTracks_P.root
-P_Strip21_2012_MagUp_nTracks_P.root
-###
diff --git a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstK/howto.txt b/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstK/howto.txt
deleted file mode 100644
index 7edea1674dcd32530f96d0a8acc1f38eae12f30c..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstK/howto.txt
+++ /dev/null
@@ -1,31 +0,0 @@
---------------------------
-Preparing workspace
---------------------------
-
-In the script directory:
-python prepareWorkspace.py --debug --configName ../data/Bs2DsstK_3fbCPV/Bs2DsstK/Bs2DsstKConfigForNominalMassFit.py -s work_dsstk.root --Data
-python prepareWorkspace.py --debug --configName ../data/Bs2DsstK_3fbCPV/Bs2DsstK/Bs2DsstKConfigForNominalMassFit.py -i work_dsstk.root -s work_dsstk_2.root --MC
-python prepareWorkspace.py --debug --configName ../data/Bs2DsstK_3fbCPV/Bs2DsstK/Bs2DsstKConfigForNominalMassFit.py -i work_dsstk.root -s work_dsstk_3.root --MCPID
-python prepareWorkspace.py --debug --configName ../data/Bs2DsstK_3fbCPV/Bs2DsstK/Bs2DsstKConfigForNominalMassFit.py -i work_dsstk_3.root -s work_dsstk_4.root --SignalPID
-python prepareWorkspace.py --debug --configName ../data/Bs2DsstK_3fbCPV/Bs2DsstK/Bs2DsstKConfigForNominalMassFit.py -i work_dsstk_4.root -s work_dsstk_5.root --Comb
-python prepareWorkspace.py --debug --configName ../data/Bs2DsstK_3fbCPV/Bs2DsstK/Bs2DsstKConfigForNominalMassFit.py -i work_dsstk_4.root -s work_dsstk_6.root --CombPID
-
-source Csh/prepare_workspace.csh work_dsstpi.root ../data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigForNominalMassFit.py > & log_work_dsstpi.txt &
-  
---------------------------
-run MDFit
---------------------------
-
-1D, 5 modes, merged both polarities and years of data taking:
-python runMDFitter.py --debug --configName ../data/Bs2DsstK_3fbCPV/Bs2DsstK/Bs2DsstKConfigForNominalMassFit.py --pol both --year run1 --mode all --merge both --dim 1 --fileName work_dsstk_6.root
-python runMDFitter.py --debug --configName ../data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigForNominalMassFit.py --pol both --year run1 --mode all --merge both --dim 3 --fileName work_dsstpi.root -s WS_MDFit_DsstPi.root >& log_fit_dsstpi.txt &
-
-python runMDFitter.py --debug --configName ../data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigForNominalMassFit.py --pol both --year 2011 --mode 3modeskkpi --merge pol --dim 3 --fileName work_dsstpi_basic_3.root -s WS_MDFit_DsstPi_2011.root > & log_fit_dsstpi_2011.txt &
-python runMDFitter.py --debug --configName ../data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigForNominalMassFit.py --pol both --year 2012 --mode 3modeskkpi --merge pol --dim 3 --fileName work_dsstpi_basic_3.root -s WS_MDFit_DsstPi_2012.root > & log_fit_dsstpi_2012.txt &
---------------------------
-plot MDFitter
---------------------------
-python plotMDFitter.py WS_MDFit_Results.root --configName ../data/Bs2DsstK_3fbCPV/Bs2DsstK/Bs2DsstKConfigForNominalMassFit.py --pol both --year run1 --mode all --merge both --dim 1
-source Csh/plot_shapes.csh WS_MDFit_Results.root ../data/Bs2DsstK_3fbCPV/Bs2DsstK/Bs2DsstKConfigForNominalMassFit.py > & log_plot_dsstk.txt &
-
-python fitSignal.py --debug --configName ../data/Bs2DsstK_3fbCPV/Bs2DsstPi/SignalConfigForFit.py --pol both --year run1 --mode all --merge both --var BeautyMass --fileName work_signal.root
diff --git a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigForCombinatorialFit.py b/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigForCombinatorialFit.py
deleted file mode 100644
index 4e834a5e9780335acff1e7f6a2e3ee72b65b3b82..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigForCombinatorialFit.py
+++ /dev/null
@@ -1,81 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "CombPi_BeautyMass"
-    configdict["CharmModes"] = {"NonRes", "PhiPi", "KstK", "KPiPi", "PiPiPi"}
-    # year of data taking                                                                                 
-    configdict["YearOfDataTaking"] = {"2012", "2011"}
-    # stripping (necessary in case of PIDK shapes)                               
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)
-    configdict["IntegratedLuminosity"] = {"2011":{"Down": 0.5584, "Up": 0.4167}, "2012":{"Down": 0.9894, "Up": 0.9985}}
-    # file name with paths to MC/data samples                                     
-    configdict["dataName"] = "../data/Bs2DsstK_3fbCPV/Bs2DsstPi/config_Bs2DsstPi.txt"
-
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsstPi", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5000,    6000    ], "InputName" : "FBs_DeltaM_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [2080,    2150    ], "InputName" : "FDsst_DeltaM_M"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     12.0    ], "InputName" : "FBs_LF_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [1000.,   650000.0], "InputName" : "FBac_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [500.,    45000.0 ], "InputName" : "FBac_Ptr"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,    5.0     ], "InputName" : "FBac_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.,     1000.0  ], "InputName" : "FnTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "FBs_LF_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "FBac_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [-1.,     1.0     ], "InputName" : "FBDT_Var"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "FBs_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "FBs_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [0.0,     0.5     ], "InputName" : "FBs_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [0.0,     0.5     ], "InputName" : "FBs_SS_nnetKaon_PROB"}
-    
-     #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "RooHILLidni"
-    configdict["BsSignalShape"]["a"]       = {"Run1": {"All": 5200.0}, "Fixed":False}
-    configdict["BsSignalShape"]["b"]       = {"Run1": {"All": 5400.0}, "Fixed":False}
-    configdict["BsSignalShape"]["csi"]     = {"Run1": {"All": 1.0},    "Fixed":False}
-    configdict["BsSignalShape"]["shift"]   = {"Run1": {"All": 0.0},    "Fixed":True}
-    configdict["BsSignalShape"]["sigma"]   = {"Run1": {"All": 20.0},   "Fixed":False}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"All": 5.0},    "Fixed":False}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"All": 0.95},    "Fixed":False}
-    
-    
-    #expected yields
-    configdict["Yields"] = {}
-    configdict["Yields"]["Signal"]     = {"2012": {"NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":5000.0, "PiPiPi":5000.0},
-                                          "2011": {"NonRes":5000.0, "PhiPi":5000.0, "KstK":5000.0, "KPiPi":2500.0, "PiPiPi":2500.0}, "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig"] #, "CombBkg", "Bd2DsstPi", "Bs2DsRho", "Bs2DsstRho"]
-    configdict["PlotSettings"]["colors"] = [kRed-7] #, kBlue-6, kOrange, kBlue-10, kGreen+3]
-    #configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bs2DsRho", "Bs2DsstRho"]
-    #configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kBlue-10, kGreen+3]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.75, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.2,0.9], 
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigForMCSplineFit.py b/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigForMCSplineFit.py
deleted file mode 100644
index 2f5c05c51642abdeb5fa893cedbad1b6fed8599c..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigForMCSplineFit.py
+++ /dev/null
@@ -1,40 +0,0 @@
-def getconfig() :
-
-    from Bs2DsstPiConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Tau_H"] = 1.661000 #1.660999991
-    configdict["Tau_L"] = 1.405000 #1.404999988
-    configdict["Gamma_H"] = 1.0/configdict["Tau_H"]
-    configdict["Gamma_L"] = 1.0/configdict["Tau_L"]
-    configdict["Gammas"]  = (configdict["Gamma_H"] + configdict["Gamma_L"])/2.0
-    configdict["Tau"] = 1.52231245
-    configdict["DeltaGammas"] =  (configdict["Gamma_H"] - configdict["Gamma_L"])
-
-
-    configdict["DeltaMs"]       = 0.0   # in ps^{-1}                                                                                                                                   
-    configdict["cos"] = 0.0
-    configdict["sin"] = 0.0
-    configdict["sinh"] = 0.0
-
-    configdict["Bins"] = 1000
-
-    configdict["CPlimit"]       = {"upper":4.0, "lower":-4.0} 
-
-    #configdict["Acceptance"] = { "knots":  [0.50,       1.0,        1.5,        2.0,        3.0,        10.0],
-    #                             "values": [4.5579e-01, 7.0310e-01, 8.7709e-01, 1.1351e+00, 1.0e+00, 1.0e+00] }
-
-    #configdict["Acceptance"] = { "knots":  [0.50, 1.0,   1.5,   2.0,   3.0, 8.0],
-    #                             "values": [0.41, 0.603, 0.803, 0.93, 0.98, 1.0] }
-
-    configdict["Acceptance"] = { "knots":  [0.50, 1.0,   2.0,   3.0,  10.0],
-                                 "values": [1.59, 2.21, 3.16, 3.87, 2.61] }
-    
-    configdict["Resolution"] = {"scaleFactor":1.201}
-
-    configdict["constParams"] = []
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigForNominalDMSFitSplinesFloatAcc.py b/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigForNominalDMSFitSplinesFloatAcc.py
deleted file mode 100644
index d19dc6c24d7c24f217de196f01b34e0561b6159c..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigForNominalDMSFitSplinesFloatAcc.py
+++ /dev/null
@@ -1,100 +0,0 @@
-def getconfig() :
-
-    from Bs2DsstPiConfigForNominalMassFit import getconfig as getconfig_nominal
-    configdict = getconfig_nominal()
-
-    from math import pi
-
-    # PHYSICAL PARAMETERS
-    configdict["Gammas"]        =  0.6643 #0.0020   # in ps^{-1}
-    configdict["DeltaGammas"]   =  -0.083 #-0.006
-    configdict["DeltaMs"]       = 17.757   # in ps^{-1}
-    configdict["TagEffSig"]     = 0.403
-    configdict["TagOmegaSig"]   = 0.391
-    configdict["StrongPhase"]   = 20. / 180. * pi
-    configdict["WeakPhase"]     = 70./180.*pi
-    configdict["ModLf"]         = 0.372
-    configdict["CPlimit"]       = {"upper":4.0, "lower":-4.0} 
-
-
-    configdict["Asymmetries"] = {"Detection":1.0/100.0,
-                                 "Production":1.1/100.0}
-    configdict["TaggingCalibration"] = {}
-
-    configdict["FixAcceptance"] = False
-    configdict["ConstrainsForTaggingCalib"] = True
-
-    configdict["UsedResolution"] = "Nominal"
-
-    # Nominal Resolution and corresponding tagging parameters
-    configdict["Resolution"] = { "scaleFactor":{"p0":0.010262, "p1":1.280, "p2":0.0},
-                                 "meanBias":0.0,
-                                 "shape": { "sigma1":2.14946e-02, "sigma2":3.67643e-02, "sigma3":6.32869e-02,
-                                            "frac1":3.72147e-01, "frac2":5.65150e-01},
-                                 "templates": { "fileName":"work_templates_dspi.root",
-                                                "workName":"work",
-                                                "templateName":"TimeErrorPdf_Bs2DsPi"} }
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.44119, "dp0": 0.0, "p1": 1.0868, "dp1": 0.0,
-                                              "cov": [ [2.903e-05, 0.0, 0.0001613, 0.0],
-                                                       [0.0, 1.0, 0.0, 0.0],
-                                                       [0.0001613, 0.0, 0.006101, 0.0],
-                                                       [0.0, 0.0, 0.0, 1.0]],
-                                              "average": 0.43744, "tagEff":0.63926, "aTagEff":0.0, "use":True}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.37718, "dp0": 0.0, "p1": 1.1244, "dp1": 0.0,
-                                              "cov": [ [5.212e-05, 0.0, 0.0002286, 0.0],
-                                                       [0.0, 1.0, 0.0, 0.0],
-                                                       [0.0002286, 0.0, 0.006685, 0.0],
-                                                       [0.0, 0.0, 0.0, 1.0]],
-                                              "average": 0.369798, "tagEff":0.37151, "aTagEff":0.0, "use":True}
-
-#    configdict["Acceptance"] = { "knots": [0.50, 1.0,  1.5, 2.0, 3.0, 10.0],
-#                                 "values": [3.774e-01,5.793e-01,7.752e-01,1.0043e+00,1.0937e+00,1.1872e+00] }
-
-    configdict["Acceptance"] = { "knots":   [0.50,           1.0,            2.0,            3.0,            10.0],
-                                 "values": [4.5579e-01, 7.0310e-01, 1.1351e+00, 1.0e+00, 1.0e+00] }
-
-    configdict["constParams"] = []
-    configdict["constParams"].append('Gammas_Bs2DsstPi')
-    configdict["constParams"].append('deltaGammas_Bs2DsstPi')
-    configdict["constParams"].append('C_Bs2DsstPi')
-    configdict["constParams"].append('Cbar_Bs2DsstPi')
-    configdict["constParams"].append('S_Bs2DsstPi')
-    configdict["constParams"].append('Sbar_Bs2DsstPi')
-    configdict["constParams"].append('D_Bs2DsstPi')
-    configdict["constParams"].append('Dbar_Bs2DsstPi')
-    configdict["constParams"].append('tagEff_OS')
-    configdict["constParams"].append('tagEff_SS')
-    configdict["constParams"].append('tagEff_Both')
-    configdict["constParams"].append('aTagEff_OS')
-    configdict["constParams"].append('aTagEff_SS')
-    configdict["constParams"].append('aTagEff_Both')
-    if configdict["FixAcceptance"] == True:
-        configdict["constParams"].append('var1')
-        configdict["constParams"].append('var2')
-        configdict["constParams"].append('var3')
-        configdict["constParams"].append('var4')
-        configdict["constParams"].append('var5')
-        configdict["constParams"].append('var6')
-        configdict["constParams"].append('var7')
-    if configdict["ConstrainsForTaggingCalib"] == False:
-        configdict["constParams"].append('p0_OS')
-        configdict["constParams"].append('p0_SS')
-        configdict["constParams"].append('p1_OS')
-        configdict["constParams"].append('p1_SS')
-    configdict["constParams"].append('dp0_OS')
-    configdict["constParams"].append('dp0_SS')
-    configdict["constParams"].append('dp1_OS')
-    configdict["constParams"].append('dp1_SS')
-    configdict["constParams"].append('p0_mean_OS')
-    configdict["constParams"].append('p0_mean_SS')
-    configdict["constParams"].append('p1_mean_OS')
-    configdict["constParams"].append('p1_mean_SS')
-    configdict["constParams"].append('dp0_mean_OS')
-    configdict["constParams"].append('dp0_mean_SS')
-    configdict["constParams"].append('dp1_mean_OS')
-    configdict["constParams"].append('dp1_mean_SS')
-    configdict["constParams"].append('average_OS')
-    configdict["constParams"].append('average_SS')
-#    configdict["constParams"].append('DeltaMs_Bs2DsPi')
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigForNominalMassFit.py b/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigForNominalMassFit.py
deleted file mode 100644
index 983439f21e83e357cb58ea1ddb4165e136be761d..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigForNominalMassFit.py
+++ /dev/null
@@ -1,241 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bs2DsstPi"
-    configdict["CharmModes"] = {"NonRes", "PhiPi", "KstK", "KPiPi", "PiPiPi"}
-    configdict["Backgrounds"] = ["Bs2DsRho","Bs2DsstRho","Bd2DsstPi"] 
-    # year of data taking                                                                                 
-    configdict["YearOfDataTaking"] = {"2012", "2011"}
-    # stripping (necessary in case of PIDK shapes)                               
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)
-    configdict["IntegratedLuminosity"] = {"2011":{"Down": 0.5584, "Up": 0.4167}, "2012":{"Down": 0.9894, "Up": 0.9985}}
-    # file name with paths to MC/data samples                                     
-    configdict["dataName"] = "../data/Bs2DsstK_3fbCPV/Bs2DsstPi/config_Bs2DsstPi.txt"
-
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsstPi", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5100,    6000    ], "InputName" : "FBs_DeltaM_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [2080,    2150    ], "InputName" : "FDsst_DeltaM_M"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     12.0    ], "InputName" : "FBs_LF_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [1000.,   650000.0], "InputName" : "FBac_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [500.,    45000.0 ], "InputName" : "FBac_Ptr"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,    5.0     ], "InputName" : "FBac_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.,     1000.0  ], "InputName" : "FnTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "FBs_LF_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "FBac_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [-1.,     1.0     ], "InputName" : "FBDT_Var"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "FBs_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "FBs_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [0.0,     0.5     ], "InputName" : "FBs_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [0.0,     0.5     ], "InputName" : "FBs_SS_nnetKaon_PROB"}
-    '''
-    # additional variables in data sets
-    configdict["AdditionalVariables"] = {}
-    configdict["AdditionalVariables"]["BacEta"]   = { "Range" : [-9.0,    9.0     ], "InputName" : "FBac_Eta"}
-    configdict["AdditionalVariables"]["PhEta"]    = { "Range" : [-9.0,    9.0     ], "InputName" : "FPh_Eta"}
-    configdict["AdditionalVariables"]["PhPT"]     = { "Range" : [ 0.0,    1.e+9   ], "InputName" : "FPh_Ptr"}
-    configdict["AdditionalVariables"]["PhCL"]     = { "Range" : [ 0.0,    1.0     ], "InputName" : "FPh_CL"}
-    configdict["AdditionalVariables"]["PhisNotE"] = { "Range" : [ 0.0,    1.0     ], "InputName" : "FPh_isNotE"}
-    configdict["AdditionalVariables"]["BsEta"]    = { "Range" : [-9.0,    9.0     ], "InputName" : "FBs_Eta"}
-    configdict["AdditionalVariables"]["BsPhi"]    = { "Range" : [ 0.0,    9.0     ], "InputName" : "FBs_Phi"}
-    configdict["AdditionalVariables"]["BsPT"]     = { "Range" : [ 0.0,    1.e+9   ], "InputName" : "FBs_Ptr"}
-    configdict["AdditionalVariables"]["DsDec"]    = { "Range" : [ 0.0,    6.0     ], "InputName" : "FDs_Dec"}
-    configdict["AdditionalVariables"]["KpPT"]     = { "Range" : [100.,45000.0     ], "InputName" : "FKp_Ptr"}
-    configdict["AdditionalVariables"]["KmPT"]     = { "Range" : [100.,45000.0     ], "InputName" : "FKm_Ptr"}
-    configdict["AdditionalVariables"]["PiPT"]     = { "Range" : [100.,45000.0     ], "InputName" : "FPi_Ptr"}
-    configdict["AdditionalVariables"]["PtrRel"]   = { "Range" : [ 0.0,  200.      ], "InputName" : "FPtr_Rel"}
-    configdict["AdditionalVariables"]["CosTheS"]  = { "Range" : [-1.0,     1.0    ], "InputName" : "FCTS_Ds"}
-    configdict["AdditionalVariables"]["BsIpChi2Own"] = { "Range" : [ 0.0,  100.    ], "InputName" : "FBs_IpChi2Own"}
-    configdict["AdditionalVariables"]["BsDIRAOwn"]= { "Range" : [-1.0,     1.0    ], "InputName" : "FBs_DIRAOwn"}
-    configdict["AdditionalVariables"]["BsRFD"]    = { "Range" : [ 0.0,   100.0    ], "InputName" : "FBs_RFD"}
-    configdict["AdditionalVariables"]["DsDIRAOri"]= { "Range" : [-1.0,     1.0    ], "InputName" : "FDs_DIRAOri"}
-    configdict["AdditionalVariables"]["nSPDHits"] = { "Range" : [ 0.0,  1000.0    ], "InputName" : "FnSPDHits"}
-    '''
-    
-    # tagging calibration                                                                                               
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3834, "p1": 0.9720, "average": 0.3813}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4244, "p1": 1.2180, "average": 0.4097}
-
-    # additional cuts applied to data sets
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = {"Data": "FDs_M>1950.&&FDs_M<1990.&&FDs_FDCHI2_ORIVX>2.&&FDelta_M>111.5&&FDelta_M<181.5&&FBs_Veto==0.&&FBDT_Var>0.01",
-                                              "MC":   "FDs_M>1950.&&FDs_M<1990.&&FDs_FDCHI2_ORIVX>2.&&FDelta_M>111.5&&FDelta_M<181.5&&FBs_Veto==0.&&FBDT_Var>0.01"}
-    configdict["AdditionalCuts"]["NonRes"] = {"Data":"FDs_Dec==3.", "MC":"FDs_Dec==3."}
-    configdict["AdditionalCuts"]["PhiPi"]  = {"Data":"FDs_Dec==1.", "MC":"FDs_Dec==1."}
-    configdict["AdditionalCuts"]["KstK"]   = {"Data":"FDs_Dec==2.", "MC":"FDs_Dec==2."}
-    configdict["AdditionalCuts"]["KPiPi"]  = {"Data":"FDs_FDCHI2_ORIVX>9.&&FPi_PIDK>10.&&FKp_PIDK<0.&&FKm_PIDK<0.&&FKst_M<1750.",
-                                              "MC":  "FDs_FDCHI2_ORIVX>9.&&FKst_M<1750."}
-    configdict["AdditionalCuts"]["PiPiPi"] = {"Data":"FDs_FDCHI2_ORIVX>9.&&FKp_PIDK<0.&&FKm_PIDK<0.&&FPi_PIDK<0.&&FPhi_M<1700.&&FKst_M<1700.", 
-                                              "MC":  "FDs_FDCHI2_ORIVX>9.&&FPhi_M<1700.&&FKst_M<1700."}
- 
-    configdict["CreateCombinatorial"] = {}
-    configdict["CreateCombinatorial"]["BeautyMass"] = {} 
-    configdict["CreateCombinatorial"]["BeautyMass"]["All"]    = {"Cut":"FBs_DeltaM_M>5100.&&FBs_DeltaM_M<6000.&&FDs_M>1950.&&FDs_M<1990.&&FDs_FDCHI2_ORIVX>2.&&FDelta_M>195.&&FDelta_M<205.&&FBs_Veto==0.&&FBDT_Var>0.01&&FBac_P>1000.&&FBac_P<650000.&&FBac_Ptr>500.&&FBac_Ptr<45000.",
-                                                                 "Rho":3.5, "Mirror":"Left"}
-    configdict["CreateCombinatorial"]["BeautyMass"]["NonRes"] = {"Cut":"FDs_Dec==3."}
-    configdict["CreateCombinatorial"]["BeautyMass"]["PhiPi"]  = {"Cut":"FDs_Dec==1."}
-    configdict["CreateCombinatorial"]["BeautyMass"]["KstK"]   = {"Cut":"FDs_Dec==2."}
-    configdict["CreateCombinatorial"]["BeautyMass"]["KPiPi"]  = {"Cut":"FDs_FDCHI2_ORIVX>9.&&FPi_PIDK>10.&&FKp_PIDK<0.&&FKm_PIDK<0.&&FKst_M<1750."}
-    configdict["CreateCombinatorial"]["BeautyMass"]["PiPiPi"] = {"Cut":"FDs_FDCHI2_ORIVX>9.&&FKp_PIDK<0.&&FKm_PIDK<0.&&FPi_PIDK<0.&&FPhi_M<1700.&&FKst_M<1700."}
-    
-    configdict["CreateCombinatorial"]["BacPIDK"] = {}
-    configdict["CreateCombinatorial"]["BacPIDK"]["All"]       = {"Cut":"FBs_DeltaM_M>5100.&&FBs_DeltaM_M<6000.&&FDs_M>1950.&&FDs_M<1990.&&FDs_FDCHI2_ORIVX>2.&&FDelta_M>195.&&FDelta_M<205.&&FBs_Veto==0.&&FBDT_Var>0.01&&FBac_P>1000.&&FBac_P<650000.&&FBac_Ptr>500.&&FBac_Ptr<45000.",
-                                                              "Rho":1.25, "Mirror":"Left"}
-
-    configdict["WeightingMassTemplates"] = { "RatioDataMC":{"FileLabel":{"2011":"#RatioDataMC 2011 PNTr","2012":"#RatioDataMC 2012 PNTr"},
-                                                            "Var":["FBac_P","FnTracks"],"HistName":"histRatio"},
-                                             "Shift":{ "BeautyMass": 3.3, "CharmMass": 2.8} }
-    # configdict["WeightingMassTemplates"] = { "Shift":{ "BeautyMass": 3.3, "CharmMass": 2.8} }
-    #configdict["WeightingMassTemplates"]={"PIDBachEff":      {"FileLabel":{"2011":"#PIDK Pion 2011","2012":"#PIDK Pion 2012"},
-    #                                                          "Var":["nTracks","lab1_P"],"HistName":"MyPionEff_0_mu2"},
-    #                                      "PIDBachMisID":    {"FileLabel":{"2011":"#PIDK Kaon 2011","2012":"#PIDK Kaon 2012"},
-    #                                                          "Var":["nTracks","lab1_P"],"HistName":"MyKaonMisID_0_mu2"},
-    #                                      "PIDChildKaonPionMisID":{"FileLabel":{"2011":"#PIDK Pion 2011","2012":"#PIDK Pion 2012"},
-    #                                                               "Var":["nTracks","lab3_P"],"HistName":"MyPionMisID_0"},
-    #                                      "PIDChildProtonMisID": {"FileLabel":{"2011":"#PIDK Proton 2011","2012":"#PIDK Proton 2012"},
-    #                                                              "Var":["nTracks","lab4_P"],"HistName":"MyProtonMisID_pKm5_KPi5"},
-    #                                      "RatioDataMC":{"FileLabel":{"2011":"#RatioDataMC 2011 PNTr","2012":"#RatioDataMC 2012 PNTr"},
-    #                                                     "Var":["lab1_P","nTracks"],"HistName":"histRatio"}, 
-    #                                      "Shift":{"BeautyMass":-2.0,"CharmMass":0.0}}
-    # configdict["WeightingMassTemplates"] = { }
-
-    #weighting for PID templates
-    # configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[20,20] }
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[30,30] }
-
-    #PID Calibration samples for PID shapes
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2011", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2011", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2012", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2012", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All": 5.3693e+03}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"All": 1.5759e+01}, "Fixed":True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"All": 2.5573e+01}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"All":-2.4014e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"All": 1.8006e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"All": 1.5500e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"All": 1.2300e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"All": 5.3068e-01}, "Fixed":True}
-    configdict["BsSignalShape"]["R"]    =    {"Run1": {"All": 1.},         "Fixed":False}
-    
-    # Ds signal shapes
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All": 2.1113e+03}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"All": 1.2887e+01}, "Fixed":True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"All": 9.1093e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"All": 3.7695e-01}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"All":-6.5258e-01}, "Fixed":True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"All": 1.2198e+02}, "Fixed":True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"All": 4.3626e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"All": 1.0932e-01}, "Fixed":True}
-    configdict["DsSignalShape"]["R"]    =    {"Run1": {"All": 1.},         "Fixed":False}
-
-    # combinatorial background              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"] = "RooKeysPdf"
-    configdict["BsCombinatorialShape"]["name"] = {"2012": {"NonRes": "PhysBkgCombPi_BeautyMassPdf_m_both_nonres_2012",
-                                                           "PhiPi":  "PhysBkgCombPi_BeautyMassPdf_m_both_phipi_2012",
-                                                           "KstK":   "PhysBkgCombPi_BeautyMassPdf_m_both_kstk_2012",
-                                                           "KPiPi":  "PhysBkgCombPi_BeautyMassPdf_m_both_kpipi_2012",
-                                                           "PiPiPi": "PhysBkgCombPi_BeautyMassPdf_m_both_pipipi_2012"},
-                                                  "2011": {"NonRes": "PhysBkgCombPi_BeautyMassPdf_m_both_nonres_2011",
-                                                           "PhiPi":  "PhysBkgCombPi_BeautyMassPdf_m_both_phipi_2011",
-                                                           "KstK":   "PhysBkgCombPi_BeautyMassPdf_m_both_kstk_2011",
-                                                           "KPiPi":  "PhysBkgCombPi_BeautyMassPdf_m_both_kpipi_2011",
-                                                           "PiPiPi": "PhysBkgCombPi_BeautyMassPdf_m_both_pipipi_2011"}}
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" 
-    configdict["DsCombinatorialShape"]["cD"]    = {"Run1": {"NonRes":0.001, "PhiPi":0.001, "KstK":0.001, "KPiPi":0.001, "PiPiPi":0.001}, "Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"] = {"Run1": {"NonRes":0.5,   "PhiPi":0.5,   "KstK":0.5,   "KPiPi":0.5,   "PiPiPi":0.5},   "Fixed":False}
-
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "FixedWithPionKaon"
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"] = { "Run1":{"PhiPi":0.5, "NonRes":0.5, "KstK":0.5, "KPiPi":0.5, "PiPiPi":0.5}, "Fixed":False }
-
-    configdict["Bd2DsstPiShape"] = {}
-    configdict["Bd2DsstPiShape"]["BeautyMass"] = {}
-    configdict["Bd2DsstPiShape"]["BeautyMass"]["type"]    = "ShiftedSignal"
-    configdict["Bd2DsstPiShape"]["BeautyMass"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2DsstPiShape"]["BeautyMass"]["scale1"]  = {"Run1": {"All": 1.0}, "Fixed":True}
-    configdict["Bd2DsstPiShape"]["BeautyMass"]["scale2"]  = {"Run1": {"All": 1.0}, "Fixed":True}
-
-    #expected yields
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bs2DsstRho"] = {"2012": { "NonRes":4000.0, "PhiPi":4000.0, "KstK":4000.0, "KPiPi":4000.0, "PiPiPi":4000.0},  
-                                          "2011": { "NonRes":2000.0, "PhiPi":2000.0, "KstK":2000.0, "KPiPi":2000.0, "PiPiPi":2000.0}, "Fixed":False}
-    configdict["Yields"]["Bd2DsstPi"]  = {"2012": { "NonRes":0.0, "PhiPi":0.0, "KstK":0.0, "KPiPi":0.0, "PiPiPi":0.0},
-                                          "2011": { "NonRes":0.0, "PhiPi":0.0, "KstK":0.0, "KPiPi":0.0, "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Bs2DsRho"]   = {"2012": { "NonRes":4000.0, "PhiPi":4000.0, "KstK":4000.0, "KPiPi":4000.0, "PiPiPi":4000.0},
-                                          "2011": { "NonRes":2000.0, "PhiPi":2000.0, "KstK":2000.0, "KPiPi":2000.0, "PiPiPi":2000.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]    = {"2012": {"NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},
-                                          "2011": {"NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0}, "Fixed":False}
-    configdict["Yields"]["Signal"]     = {"2012": {"NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":5000.0, "PiPiPi":5000.0},
-                                          "2011": {"NonRes":5000.0, "PhiPi":5000.0, "KstK":5000.0, "KPiPi":2500.0, "PiPiPi":2500.0}, "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bd2DsstPi", "Bs2DsRho", "Bs2DsstRho"]
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kBlue-10, kGreen+3]
-    #configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bs2DsRho", "Bs2DsstRho"]
-    #configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kBlue-10, kGreen+3]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.75, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.2,0.9], 
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigForNominalMassFitNew.py b/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigForNominalMassFitNew.py
deleted file mode 100644
index b889c508989d99cc0fc5ea67d04f7568a45e099c..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigForNominalMassFitNew.py
+++ /dev/null
@@ -1,253 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bs2DsstPi"
-    configdict["CharmModes"] = {"NonRes", "PhiPi", "KstK", "KPiPi", "PiPiPi"}
-    configdict["Backgrounds"] = ["Bs2DsRho","Bs2DsstRho","Bd2DsstPi"]
-    # year of data taking                                                                                 
-    configdict["YearOfDataTaking"] = {"2012", "2011"}
-    # stripping (necessary in case of PIDK shapes)                               
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)
-    configdict["IntegratedLuminosity"] = {"2011":{"Down": 0.5584, "Up": 0.4167}, "2012":{"Down": 0.9894, "Up": 0.9985}}
-    # file name with paths to MC/data samples                                     
-    configdict["dataName"] = "../data/Bs2DsstK_3fbCPV/Bs2DsstPi/config_Bs2DsstPi.txt"
-
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsstPi", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5100,    6000    ], "InputName" : "FBs_DeltaM_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [2080,    2150    ], "InputName" : "FDsst_DeltaM_M"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     12.0    ], "InputName" : "FBs_LF_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [1000.,   650000.0], "InputName" : "FBac_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [500.,    45000.0 ], "InputName" : "FBac_Ptr"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,    5.0     ], "InputName" : "FBac_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.,     1000.0  ], "InputName" : "FnTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "FBs_LF_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "FBac_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [-1.,     1.0     ], "InputName" : "FBDT_Var"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "FBs_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "FBs_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [0.0,     0.5     ], "InputName" : "FBs_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [0.0,     0.5     ], "InputName" : "FBs_SS_nnetKaon_PROB"}
-    '''
-    # additional variables in data sets
-    configdict["AdditionalVariables"] = {}
-    configdict["AdditionalVariables"]["BacEta"]   = { "Range" : [-9.0,    9.0     ], "InputName" : "FBac_Eta"}
-    configdict["AdditionalVariables"]["PhEta"]    = { "Range" : [-9.0,    9.0     ], "InputName" : "FPh_Eta"}
-    configdict["AdditionalVariables"]["PhPT"]     = { "Range" : [ 0.0,    1.e+9   ], "InputName" : "FPh_Ptr"}
-    configdict["AdditionalVariables"]["PhCL"]     = { "Range" : [ 0.0,    1.0     ], "InputName" : "FPh_CL"}
-    configdict["AdditionalVariables"]["PhisNotE"] = { "Range" : [ 0.0,    1.0     ], "InputName" : "FPh_isNotE"}
-    configdict["AdditionalVariables"]["BsEta"]    = { "Range" : [-9.0,    9.0     ], "InputName" : "FBs_Eta"}
-    configdict["AdditionalVariables"]["BsPhi"]    = { "Range" : [ 0.0,    9.0     ], "InputName" : "FBs_Phi"}
-    configdict["AdditionalVariables"]["BsPT"]     = { "Range" : [ 0.0,    1.e+9   ], "InputName" : "FBs_Ptr"}
-    configdict["AdditionalVariables"]["DsDec"]    = { "Range" : [ 0.0,    6.0     ], "InputName" : "FDs_Dec"}
-    configdict["AdditionalVariables"]["KpPT"]     = { "Range" : [100.,45000.0     ], "InputName" : "FKp_Ptr"}
-    configdict["AdditionalVariables"]["KmPT"]     = { "Range" : [100.,45000.0     ], "InputName" : "FKm_Ptr"}
-    configdict["AdditionalVariables"]["PiPT"]     = { "Range" : [100.,45000.0     ], "InputName" : "FPi_Ptr"}
-    configdict["AdditionalVariables"]["PtrRel"]   = { "Range" : [ 0.0,  200.      ], "InputName" : "FPtr_Rel"}
-    configdict["AdditionalVariables"]["CosTheS"]  = { "Range" : [-1.0,     1.0    ], "InputName" : "FCTS_Ds"}
-    configdict["AdditionalVariables"]["BsIpChi2Own"] = { "Range" : [ 0.0,  100.    ], "InputName" : "FBs_IpChi2Own"}
-    configdict["AdditionalVariables"]["BsDIRAOwn"]= { "Range" : [-1.0,     1.0    ], "InputName" : "FBs_DIRAOwn"}
-    configdict["AdditionalVariables"]["BsRFD"]    = { "Range" : [ 0.0,   100.0    ], "InputName" : "FBs_RFD"}
-    configdict["AdditionalVariables"]["DsDIRAOri"]= { "Range" : [-1.0,     1.0    ], "InputName" : "FDs_DIRAOri"}
-    configdict["AdditionalVariables"]["nSPDHits"] = { "Range" : [ 0.0,  1000.0    ], "InputName" : "FnSPDHits"}
-    '''
-    
-    # tagging calibration                                                                                               
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3834, "p1": 0.9720, "average": 0.3813}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4244, "p1": 1.2180, "average": 0.4097}
-
-    # additional cuts applied to data sets
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = {"Data": "FDs_M>1950.&&FDs_M<1990.&&FDs_FDCHI2_ORIVX>2.&&FDelta_M>111.5&&FDelta_M<181.5&&FBs_Veto==0.&&FBDT_Var>0.01",
-                                              "MC":   "FDs_M>1950.&&FDs_M<1990.&&FDs_FDCHI2_ORIVX>2.&&FDelta_M>111.5&&FDelta_M<181.5&&FBs_Veto==0.&&FBDT_Var>0.01"}
-    configdict["AdditionalCuts"]["NonRes"] = {"Data":"FDs_Dec==3.", "MC":"FDs_Dec==3."}
-    configdict["AdditionalCuts"]["PhiPi"]  = {"Data":"FDs_Dec==1.", "MC":"FDs_Dec==1."}
-    configdict["AdditionalCuts"]["KstK"]   = {"Data":"FDs_Dec==2.", "MC":"FDs_Dec==2."}
-    configdict["AdditionalCuts"]["KPiPi"]  = {"Data":"FDs_FDCHI2_ORIVX>9.&&FPi_PIDK>10.&&FKp_PIDK<0.&&FKm_PIDK<0.&&FKst_M<1750.",
-                                              "MC":  "FDs_FDCHI2_ORIVX>9.&&FKst_M<1750."}
-    configdict["AdditionalCuts"]["PiPiPi"] = {"Data":"FDs_FDCHI2_ORIVX>9.&&FKp_PIDK<0.&&FKm_PIDK<0.&&FPi_PIDK<0.&&FPhi_M<1700.&&FKst_M<1700.", 
-                                              "MC":  "FDs_FDCHI2_ORIVX>9.&&FPhi_M<1700.&&FKst_M<1700."}
- 
-    configdict["CreateCombinatorial"] = {}
-    configdict["CreateCombinatorial"]["BeautyMass"] = {} 
-    configdict["CreateCombinatorial"]["BeautyMass"]["All"]    = {"Cut":"FBs_DeltaM_M>5000.&&FBs_DeltaM_M<6000.&&FDs_M>1950.&&FDs_M<1990.&&FDs_FDCHI2_ORIVX>2.&&FDelta_M>195.&&FDelta_M<205.&&FBs_Veto==0.&&FBDT_Var>0.01&&FBac_P>1000.&&FBac_P<650000.&&FBac_Ptr>500.&&FBac_Ptr<45000.",
-                                                                 "Rho":3.5, "Mirror":"Left"}
-    configdict["CreateCombinatorial"]["BeautyMass"]["NonRes"] = {"Cut":"FDs_Dec==3."}
-    configdict["CreateCombinatorial"]["BeautyMass"]["PhiPi"]  = {"Cut":"FDs_Dec==1."}
-    configdict["CreateCombinatorial"]["BeautyMass"]["KstK"]   = {"Cut":"FDs_Dec==2."}
-    configdict["CreateCombinatorial"]["BeautyMass"]["KPiPi"]  = {"Cut":"FDs_FDCHI2_ORIVX>9.&&FPi_PIDK>10.&&FKp_PIDK<0.&&FKm_PIDK<0.&&FKst_M<1750."}
-    configdict["CreateCombinatorial"]["BeautyMass"]["PiPiPi"] = {"Cut":"FDs_FDCHI2_ORIVX>9.&&FKp_PIDK<0.&&FKm_PIDK<0.&&FPi_PIDK<0.&&FPhi_M<1700.&&FKst_M<1700."}
-    
-    configdict["CreateCombinatorial"]["BacPIDK"] = {}
-    configdict["CreateCombinatorial"]["BacPIDK"]["All"]       = {"Cut":"FBs_DeltaM_M>5100.&&FBs_DeltaM_M<6000.&&FDs_M>1950.&&FDs_M<1990.&&FDs_FDCHI2_ORIVX>2.&&FDelta_M>195.&&FDelta_M<205.&&FBs_Veto==0.&&FBDT_Var>0.01&&FBac_P>1000.&&FBac_P<650000.&&FBac_Ptr>500.&&FBac_Ptr<45000.",
-                                                              "Rho":1.25, "Mirror":"Left"}
-
-    configdict["WeightingMassTemplates"] = { "RatioDataMC":{"FileLabel":{"2011":"#RatioDataMC 2011 PNTr","2012":"#RatioDataMC 2012 PNTr"},
-                                                            "Var":["FBac_P","FnTracks"],"HistName":"histRatio"},
-                                             "Shift":{ "BeautyMass": 3.3, "CharmMass": 2.8} }
-    # configdict["WeightingMassTemplates"] = { "Shift":{ "BeautyMass": 3.3, "CharmMass": 2.8} }
-    #configdict["WeightingMassTemplates"]={"PIDBachEff":      {"FileLabel":{"2011":"#PIDK Pion 2011","2012":"#PIDK Pion 2012"},
-    #                                                          "Var":["nTracks","lab1_P"],"HistName":"MyPionEff_0_mu2"},
-    #                                      "PIDBachMisID":    {"FileLabel":{"2011":"#PIDK Kaon 2011","2012":"#PIDK Kaon 2012"},
-    #                                                          "Var":["nTracks","lab1_P"],"HistName":"MyKaonMisID_0_mu2"},
-    #                                      "PIDChildKaonPionMisID":{"FileLabel":{"2011":"#PIDK Pion 2011","2012":"#PIDK Pion 2012"},
-    #                                                               "Var":["nTracks","lab3_P"],"HistName":"MyPionMisID_0"},
-    #                                      "PIDChildProtonMisID": {"FileLabel":{"2011":"#PIDK Proton 2011","2012":"#PIDK Proton 2012"},
-    #                                                              "Var":["nTracks","lab4_P"],"HistName":"MyProtonMisID_pKm5_KPi5"},
-    #                                      "RatioDataMC":{"FileLabel":{"2011":"#RatioDataMC 2011 PNTr","2012":"#RatioDataMC 2012 PNTr"},
-    #                                                     "Var":["lab1_P","nTracks"],"HistName":"histRatio"}, 
-    #                                      "Shift":{"BeautyMass":-2.0,"CharmMass":0.0}}
-    # configdict["WeightingMassTemplates"] = { }
-
-    #weighting for PID templates
-    # configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[20,20] }
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[30,30] }
-
-    #PID Calibration samples for PID shapes
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21r1.root"}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2011", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2011", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_Pi_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Up_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = {"FileName":"root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/Bs2DsK_3fbCPV/CalibrationSamples2/Calib_Dst_Down_K_PID0_Str21.root"}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1.root",
-                                                                  "WorkName":"workspace", "DataName":"dataCombBkg_up_2012", "Type":"Special",
-                                                                  "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { "FileName":"/afs/cern.ch/work/g/gtellari/public/Bs2DsK_3fb/PIDK_combo_shapes/work_Comb_DsPi_Run1.root",
-                                                                    "WorkName":"workspace", "DataName":"dataCombBkg_down_2012", "Type":"Special",
-                                                                    "WeightName":"sWeights", "PIDVarName":"lab1_PIDK", "Variables":["lab1_PT","nTracks"]}
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All": 5.3693e+03}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"All": 1.5759e+01}, "Fixed":True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"All": 2.5573e+01}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"All":-2.4014e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"All": 1.8006e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"All": 1.5500e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"All": 1.2300e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"All": 5.3068e-01}, "Fixed":True}
-    configdict["BsSignalShape"]["R"]    =    {"Run1": {"All": 1.},         "Fixed":False}
-    
-    # Ds signal shapes
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All": 2.1113e+03}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"All": 1.2887e+01}, "Fixed":True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"All": 9.1093e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"All": 3.7695e-01}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"All":-6.5258e-01}, "Fixed":True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"All": 1.2198e+02}, "Fixed":True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"All": 4.3626e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"All": 1.0932e-01}, "Fixed":True}
-    configdict["DsSignalShape"]["R"]    =    {"Run1": {"All": 1.},         "Fixed":False}
-
-    # combinatorial background              
-    #configdict["BsCombinatorialShape"] = {}
-    #configdict["BsCombinatorialShape"]["type"] = "RooKeysPdf"
-    #configdict["BsCombinatorialShape"]["name"] = {"2012": {"NonRes": "PhysBkgCombPi_BeautyMassPdf_m_both_nonres_2012",
-    #                                                       "PhiPi":  "PhysBkgCombPi_BeautyMassPdf_m_both_phipi_2012",
-    #                                                       "KstK":   "PhysBkgCombPi_BeautyMassPdf_m_both_kstk_2012",
-    #                                                       "KPiPi":  "PhysBkgCombPi_BeautyMassPdf_m_both_kpipi_2012",
-    #                                                       "PiPiPi": "PhysBkgCombPi_BeautyMassPdf_m_both_pipipi_2012"},
-    #                                              "2011": {"NonRes": "PhysBkgCombPi_BeautyMassPdf_m_both_nonres_2011",
-    ##                                                       "PhiPi":  "PhysBkgCombPi_BeautyMassPdf_m_both_phipi_2011",
-    #                                                       "KstK":   "PhysBkgCombPi_BeautyMassPdf_m_both_kstk_2011",
-    #                                                       "KPiPi":  "PhysBkgCombPi_BeautyMassPdf_m_both_kpipi_2011",
-    #                                                       "PiPiPi": "PhysBkgCombPi_BeautyMassPdf_m_both_pipipi_2011"}}
-
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"]    = "RooHILLidni"
-    configdict["BsCombinatorialShape"]["a"]       = {"Run1": {"NonRes": 4.9443e+03,  "PhiPi": 4.9443e+03, "KstK":4.9443e+03, "KPiPi": 4.9443e+03, "PiPiPi": 4.9443e+03}, "Fixed":False}
-    configdict["BsCombinatorialShape"]["b"]       = {"Run1": {"NonRes": 5.5815e+03,  "PhiPi": 5.5815e+03, "KstK":5.5815e+03, "KPiPi": 5.5815e+03, "PiPiPi": 5.5815e+03}, "Fixed":False}
-    configdict["BsCombinatorialShape"]["csi"]     = {"Run1": {"NonRes": 1.7093e+00,  "PhiPi": 1.7093e+00, "KstK":1.7093e+00, "KPiPi": 1.7093e+00, "PiPiPi": 1.7093e+00}, "Fixed":False}
-    configdict["BsCombinatorialShape"]["shift"]   = {"Run1": {"All": 0.0},         "Fixed":True}
-    configdict["BsCombinatorialShape"]["sigma"]   = {"Run1": {"NonRes": 4.0000e+01,  "PhiPi": 4.0000e+01, "KstK": 4.0000e+01, "KPiPi":3.13119e+01, "PiPiPi":3.13119e+01}, "Fixed":False}
-    configdict["BsCombinatorialShape"]["R"]       = {"Run1": {"NonRes": 6.0821e+00,  "PhiPi": 6.0821e+00, "KstK": 6.0821e+00, "KPiPi":6.84048e+00, "PiPiPi":6.84048e+00},"Fixed":False}
-    configdict["BsCombinatorialShape"]["frac"]    = {"Run1": {"NonRes": 3.9837e-01,  "PhiPi": 3.9837e-01, "KstK": 3.9837e-01, "KPiPi": 3.9837e-01, "PiPiPi": 3.9837e-01}, "Fixed":False}
-
-
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" 
-    configdict["DsCombinatorialShape"]["cD"]    = {"Run1": {"NonRes":0.001, "PhiPi":0.001, "KstK":0.001, "KPiPi":0.001, "PiPiPi":0.001}, "Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"] = {"Run1": {"NonRes":0.5,   "PhiPi":0.5,   "KstK":0.5,   "KPiPi":0.5,   "PiPiPi":0.5},   "Fixed":False}
-
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "FixedWithPionKaon"
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"] = { "Run1":{"PhiPi":0.5, "NonRes":0.5, "KstK":0.5, "KPiPi":0.5, "PiPiPi":0.5}, "Fixed":False }
-
-    configdict["Bd2DsstPiShape"] = {}
-    configdict["Bd2DsstPiShape"]["BeautyMass"] = {}
-    configdict["Bd2DsstPiShape"]["BeautyMass"]["type"]    = "ShiftedSignal"
-    configdict["Bd2DsstPiShape"]["BeautyMass"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2DsstPiShape"]["BeautyMass"]["scale1"]  = {"Run1": {"All": 1.00}, "Fixed":True}
-    configdict["Bd2DsstPiShape"]["BeautyMass"]["scale2"]  = {"Run1": {"All": 1.00}, "Fixed":True}
-
-    #expected yields
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bs2DsstRho"] = {"2012": { "NonRes":4000.0, "PhiPi":4000.0, "KstK":4000.0, "KPiPi":4000.0, "PiPiPi":4000.0},  
-                                          "2011": { "NonRes":2000.0, "PhiPi":2000.0, "KstK":2000.0, "KPiPi":2000.0, "PiPiPi":2000.0}, "Fixed":False}
-    configdict["Yields"]["Bd2DsstPi"]  = {"2012": { "NonRes":0.0, "PhiPi":0.0, "KstK":0.0, "KPiPi":0.0, "PiPiPi":0.0},
-                                          "2011": { "NonRes":0.0, "PhiPi":0.0, "KstK":0.0, "KPiPi":0.0, "PiPiPi":0.0}, "Fixed":True}
-    configdict["Yields"]["Bs2DsRho"]   = {"2012": { "NonRes":4000.0, "PhiPi":4000.0, "KstK":4000.0, "KPiPi":4000.0, "PiPiPi":4000.0},
-                                          "2011": { "NonRes":2000.0, "PhiPi":2000.0, "KstK":2000.0, "KPiPi":2000.0, "PiPiPi":2000.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]    = {"2012": {"NonRes":20000.0, "PhiPi":20000.0, "KstK":20000.0, "KPiPi":20000.0, "PiPiPi":20000.0},
-                                          "2011": {"NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":10000.0, "PiPiPi":10000.0}, "Fixed":False}
-    configdict["Yields"]["Signal"]     = {"2012": {"NonRes":10000.0, "PhiPi":10000.0, "KstK":10000.0, "KPiPi":5000.0, "PiPiPi":5000.0},
-                                          "2011": {"NonRes":5000.0, "PhiPi":5000.0, "KstK":5000.0, "KPiPi":2500.0, "PiPiPi":2500.0}, "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bd2DsstPi", "Bs2DsRho", "Bs2DsstRho"]
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kBlue-10, kGreen+3]
-    #configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bs2DsRho", "Bs2DsstRho"]
-    #configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kBlue-10, kGreen+3]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.75, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.2,0.9], 
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigGlobal.py b/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigGlobal.py
deleted file mode 100644
index 48fd6cd557fb4c4079b33f0aab7054732b88cfcf..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/Bs2DsstPiConfigGlobal.py
+++ /dev/null
@@ -1,36 +0,0 @@
-def getconfig():
-    configdict = {}
-	# 1 No Weights
-#    configdict["GlobalWeight"] = {"2011": {"NonRes": {"Down": 0.289209, "Up": 0.251107},
-#                                               "PhiPi" : {"Down": 0.952755, "Up": 0.697112},
-#                                               "KstK"  : {"Down": 0.855990, "Up": 0.629444},
-#                                               "KPiPi" : {"Down": 0.322164, "Up": 0.236617},
-#                                               "PiPiPi": {"Down": 0.281257, "Up": 0.203771}},
-#                                    "2012": {"NonRes": {"Down": 0.504975, "Up": 0.597404},
-#                                               "PhiPi" : {"Down": 0.844784, "Up": 1.000000},
-#                                               "KstK"  : {"Down": 0.786025, "Up": 0.933315},
-#                                               "KPiPi" : {"Down": 0.261030, "Up": 0.263619},
-#                                               "PiPiPi": {"Down": 0.454144, "Up": 0.482168}}}
-	# 2 DPi Weights
-#    configdict["GlobalWeight"] = {"2011": {"NonRes": {"Down": 0.276518, "Up": 0.241515},
-#                                               "PhiPi" : {"Down": 0.952154, "Up": 0.696388},
-#                                               "KstK"  : {"Down": 0.861316, "Up": 0.633159},
-#                                               "KPiPi" : {"Down": 0.325433, "Up": 0.238880},
-#                                               "PiPiPi": {"Down": 0.283598, "Up": 0.207653}},
-#                                    "2012": {"NonRes": {"Down": 0.502486, "Up": 0.598065},
-#                                               "PhiPi" : {"Down": 0.839427, "Up": 1.000000},
-#                                               "KstK"  : {"Down": 0.781442, "Up": 0.937611},
-#                                               "KPiPi" : {"Down": 0.260006, "Up": 0.264109},
-#                                               "PiPiPi": {"Down": 0.451160, "Up": 0.485865}}}
-	# 3 DsstPi Weights
-    configdict["GlobalWeight"] = {"2011": {"NonRes": {"Down": 0.283086, "Up": 0.245430},
-                                               "PhiPi" : {"Down": 1.000000, "Up": 0.731054},
-                                               "KstK"  : {"Down": 0.909715, "Up": 0.669551},
-                                               "KPiPi" : {"Down": 0.346204, "Up": 0.251875},
-                                               "PiPiPi": {"Down": 0.300899, "Up": 0.219959}},
-                                    "2012": {"NonRes": {"Down": 0.335349, "Up": 0.396745},
-                                               "PhiPi" : {"Down": 0.559205, "Up": 0.659702},
-                                               "KstK"  : {"Down": 0.522821, "Up": 0.626752},
-                                               "KPiPi" : {"Down": 0.174603, "Up": 0.176777},
-                                               "PiPiPi": {"Down": 0.302242, "Up": 0.322775}}}
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/SignalConfigForFit.py b/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/SignalConfigForFit.py
deleted file mode 100644
index 0e51e2dc04bdad4d901287a60975737fdcfa83f8..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/SignalConfigForFit.py
+++ /dev/null
@@ -1,188 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bs2DsstPi"
-    # configdict["CharmModes"] = {"NonRes", "PhiPi", "KstK"}
-    configdict["CharmModes"] = {"NonRes", "PhiPi", "KstK", "KPiPi", "PiPiPi"}
-    # year of data taking                                                                                 
-    configdict["YearOfDataTaking"] = {"2012", "2011"}
-    # stripping (necessary in case of PIDK shapes)                               
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)
-    configdict["IntegratedLuminosity"] = {"2011":{"Down": 0.57, "Up": 0.43}, "2012":{"Down": 0.49, "Up": 0.51}} 
-    # file name with paths to MC/data samples                                     
-    configdict["dataName"]   = "../data/Bs2DsstK_3fbCPV/Bs2DsstPi/config_Bs2DsstPi.txt"
-
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsstPi", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5100,    6000    ], "InputName" : "FBs_DeltaM_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [2080,    2150    ], "InputName" : "FDsstr_DeltaM_M"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.0,     1.e+9   ], "InputName" : "FBs_LF_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [1000.,   650000.0], "InputName" : "FBac_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [1000.,   45000.0 ], "InputName" : "FBac_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [0.0,     150,    ], "InputName" : "FBac_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.,     1000.0  ], "InputName" : "FnTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.0,     1.e+9   ], "InputName" : "FBs_LF_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "FBac_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.025,   1.0     ], "InputName" : "FBDT_Var"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "FBs_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "FBs_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [0.0,     0.5     ], "InputName" : "FBs_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [0.0,     0.5     ], "InputName" : "FBs_SS_nnetKaon_PROB"}
-
-    # tagging calibration                                                                                               
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3834, "p1": 0.9720, "average": 0.3813}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4244, "p1": 1.2180, "average": 0.4097}
-
-    # additional cuts applied to data sets
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = {"Data": "FDs_M>1950.&&FDs_M<1990.&&FDs_FDCHI2_ORIVX>2.&&FDelta_M>111.5&&FDelta_M<181.5&&FBs_Veto==0.&&FBDT_Var>0.025",
-                                              "MC":   "FDs_M>1950.&&FDs_M<1990.&&FDs_FDCHI2_ORIVX>2.&&FDelta_M>111.5&&FDelta_M<181.5&&FBs_Veto==0.&&FBDT_Var>0.025"}
-    configdict["AdditionalCuts"]["NonRes"] = {"Data":"FDs_Dec==3", "MC":"FDs_Dec==3"}
-    configdict["AdditionalCuts"]["PhiPi"]  = {"Data":"FDs_Dec==1", "MC":"FDs_Dec==1"}
-    configdict["AdditionalCuts"]["KstK"]   = {"Data":"FDs_Dec==2", "MC":"FDs_Dec==2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = {"Data":"FDs_Dec==5&&FDs_FDCHI2_ORIVX>9.&&FPi_PIDK>10.&&FKp_PIDK<0.&&FKm_PIDK<0.&&FKst_M<1750.",
-                                              "MC":  "FDs_Dec==5&&FDs_FDCHI2_ORIVX>9.&&FKst_M<1750."}
-    configdict["AdditionalCuts"]["PiPiPi"] = {"Data":"FDs_Dec==4&&FDs_FDCHI2_ORIVX>9.&&FKp_PIDK<0.&&FKm_PIDK<0.&&FPi_PIDK<0.&&(FPhi_M<1700.&&FKst_M<1700.)", 
-                                              "MC":  "FDs_Dec==4&&FDs_FDCHI2_ORIVX>9.&&(FPhi_M<1700.&&FKst_M<1700.)"}
- 
-    configdict["CreateCombinatorial"] = {}
-    configdict["CreateCombinatorial"]["BeautyMass"] = {} 
-    configdict["CreateCombinatorial"]["BeautyMass"]["All"]    = {"Cut":"FBs_DeltaM_M>5100&&FDs_M>1950.&&FDs_M<1990.&&FDs_FDCHI2_ORIVX>2.&&FDelta_M>205.&&FDelta_M<215.&&FBs_Veto==0.&&FBDT_Var>0.025&&FBac_P>1000.0&&FBac_P<650000.0&&FBac_PT>1000.0&&FBac_PT<45000.0",
-                                                                 "Rho":3.5, "Mirror":"Both"}
-    configdict["CreateCombinatorial"]["BeautyMass"]["NonRes"] = {"Cut":"FDs_Dec==3"}
-    configdict["CreateCombinatorial"]["BeautyMass"]["PhiPi"]  = {"Cut":"FDs_Dec==1"}
-    configdict["CreateCombinatorial"]["BeautyMass"]["KstK"]   = {"Cut":"FDs_Dec==2"}
-    configdict["CreateCombinatorial"]["BeautyMass"]["KPiPi"]  = {"Cut":"FDs_Dec==5&&FDs_FDCHI2_ORIVX>9.&&FPi_PIDK>10.&&FKp_PIDK<0.&&FKm_PIDK<0.&&FKst_M<1750."}
-    configdict["CreateCombinatorial"]["BeautyMass"]["PiPiPi"] = {"Cut":"FDs_Dec==4&&FDs_FDCHI2_ORIVX>9.&&FKp_PIDK<0.&&FKm_PIDK<0.&&FPi_PIDK<0.&&(FPhi_M<1700.&&FKst_M<1700.)"}
-
-    #weighting for PID templates
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[20,20] }
-
-    #PID Calibration samples for PID shapes
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID0_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID0_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID0_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID0_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { "FileName":"",
-                                                                  "WorkName":"workspace", "DataName":"dataSetCombPi_BeautyMass", "Type":"Workspace",
-                                                                  "WeightName":"", "PIDVarName":"BacPIDK", "Variables":["BacPT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { "FileName":"",
-                                                                  "WorkName":"workspace", "DataName":"dataSetCombPi_BeautyMass", "Type":"Workspace",
-                                                                  "WeightName":"", "PIDVarName":"BacPIDK", "Variables":["BacPT","nTracks"]}
-
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID0_Str20.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID0_Str20.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID0_Str20.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID0_Str20.root"}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { "FileName":"",
-                                                                  "WorkName":"workspace", "DataName":"dataSetCombPi_BeautyMass", "Type":"Workspace",
-                                                                  "WeightName":"", "PIDVarName":"BacPIDK", "Variables":["BacPT","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { "FileName":"",
-                                                                  "WorkName":"workspace", "DataName":"dataSetCombPi_BeautyMass", "Type":"Workspace",
-                                                                  "WeightName":"", "PIDVarName":"BacPIDK", "Variables":["BacPT","nTracks"]}
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All": 5.36878e+03}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"All": 2.88070e+01}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"All": 1.64247e+01}, "Fixed":False}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"All": 1.64214e+00}, "Fixed":False}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"All":-2.96373e+00}, "Fixed":False}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"All": 1.26124e+00}, "Fixed":False}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"All": 1.00558e+00}, "Fixed":False}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"All": 3.37315e-01}, "Fixed":False}
-    
-    # Ds signal shapes
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All": 2.11000e+03}, "Fixed":False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"All": 1.20976e+01},  "Fixed":True} 
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"All": 5.94917e+00},  "Fixed":True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"All": 1.40152e+00},  "Fixed":True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"All":-2.98478e-01}, "Fixed":True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"All": 1.44311e+02},  "Fixed":True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"All": 2.83105e+00},  "Fixed":True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"All": 5.66652e-01},  "Fixed":True}
-
-    # combinatorial background              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"] = "RooKeysPdf"
-    configdict["BsCombinatorialShape"]["name"] = {"2012": {"NonRes": "PhysBkgCombPi_BeautyMassPdf_m_both_nonres_2012",
-                                                           "PhiPi":  "PhysBkgCombPi_BeautyMassPdf_m_both_phipi_2012",
-                                                           "KstK":   "PhysBkgCombPi_BeautyMassPdf_m_both_kstk_2012",
-                                                           "KPiPi":  "PhysBkgCombPi_BeautyMassPdf_m_both_kpipi_2012",
-                                                           "PiPiPi": "PhysBkgCombPi_BeautyMassPdf_m_both_pipipi_2012"},
-                                                  "2011": {"NonRes": "PhysBkgCombPi_BeautyMassPdf_m_both_nonres_2011",
-                                                           "PhiPi":  "PhysBkgCombPi_BeautyMassPdf_m_both_phipi_2011",
-                                                           "KstK":   "PhysBkgCombPi_BeautyMassPdf_m_both_kstk_2011",
-                                                           "KPiPi":  "PhysBkgCombPi_BeautyMassPdf_m_both_kpipi_2011",
-                                                           "PiPiPi": "PhysBkgCombPi_BeautyMassPdf_m_both_pipipi_2011"}}
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" 
-    configdict["DsCombinatorialShape"]["cD"]    = {"Run1": {"NonRes":-0.05, "PhiPi":-0.05, "KstK":-0.05, "KPiPi":-0.05, "PiPiPi":-0.05}, "Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"] = {"Run1": {"NonRes":0.5,   "PhiPi":0.5,   "KstK":0.5,   "KPiPi":0.5,   "PiPiPi":0.5},   "Fixed":False}
-
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "Run1":{"All":0.5}, "Fixed":False }
-
-
-    configdict["Bd2Ds(st)XShape"] = {}
-    configdict["Bd2Ds(st)XShape"]["type"]    = "ShiftedSignal"
-    configdict["Bd2Ds(st)XShape"]["decay"]   = "Bd2DsK"
-    configdict["Bd2Ds(st)XShape"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2Ds(st)XShape"]["scale1"]  = {"Run1": {"All": 0.998944636665}, "Fixed":True}
-    configdict["Bd2Ds(st)XShape"]["scale2"]  = {"Run1": {"All": 1.00022181515}, "Fixed":True}
-
-    #expected yields                                                                                                                                                       
-    configdict["Yields"] = {}
-    configdict["Yields"]["Signal"]     = {"2012": {"NonRes":50000.0, "PhiPi":50000.0, "KstK":50000.0, "KPiPi":50000.0, "PiPiPi":50000.0},
-                                          "2011": {"NonRes":50000.0, "PhiPi":50000.0, "KstK":50000.0, "KPiPi":50000.0, "PiPiPi":50000.0}, "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig"]
-    configdict["PlotSettings"]["colors"] = [kBlue+2]
-    #configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bs2DsRho", "Bs2DsstRho"]
-    #configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kBlue-10, kGreen+3]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66], 
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/config_Bs2DsstPi.txt b/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/config_Bs2DsstPi.txt
deleted file mode 100644
index 4720c54fa560b59bfbc2b9129afef3982f74a715..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/config_Bs2DsstPi.txt
+++ /dev/null
@@ -1,340 +0,0 @@
-
-#Bs2DsstPi NonRes 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter11-s21_Bs2DsstPi_Data_dw.root
-Filter11-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi NonRes 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter12-s21_Bs2DsstPi_Data_dw.root
-Filter12-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi PhiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter11-s21_Bs2DsstPi_Data_dw.root
-Filter11-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi PhiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter12-s21_Bs2DsstPi_Data_dw.root
-Filter12-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi KstK 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter11-s21_Bs2DsstPi_Data_dw.root
-Filter11-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi KstK 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter12-s21_Bs2DsstPi_Data_dw.root
-Filter12-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi KPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter11-s21_Bs2DsstPi-K2Pi_Data_dw.root
-Filter11-s21_Bs2DsstPi-K2Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi KPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter12-s21_Bs2DsstPi-K2Pi_Data_dw.root
-Filter12-s21_Bs2DsstPi-K2Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi PiPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter11-s21_Bs2DsstPi-3Pi_Data_dw.root
-Filter11-s21_Bs2DsstPi-3Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi PiPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter12-s21_Bs2DsstPi-3Pi_Data_dw.root
-Filter12-s21_Bs2DsstPi-3Pi_Data_up.root
-tuple
-tuple
-###
-
-#MC FileName KKPi MD 2012
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bs2Dsrho_dw.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bs2Dsstrho_dw.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
- {"Mode":"Bd2DsstPi",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bd2DsstPi_dw.root",
- "TreeName":"tuple;1"}
-###
-
-#MC FileName KKPi MU 2012
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bs2Dsrho_up.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bs2Dsstrho_up.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
- {"Mode":"Bd2DsstPi",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bd2DsstPi_up.root",
- "TreeName":"tuple;1"}
-###
-
-#MC FileName KKPi MD 2011
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bs2Dsrho_dw.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bs2Dsstrho_dw.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
- {"Mode":"Bd2DsstPi",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bd2DsstPi_dw.root",
- "TreeName":"tuple;1"}
-###
-
-#MC FileName KKPi MU 2011
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bs2Dsrho_up.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bs2Dsstrho_up.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
- {"Mode":"Bd2DsstPi",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bd2DsstPi_up.root",
- "TreeName":"tuple;1"}
-###
-
-#Signal Bs2DsstPi NonRes 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter-s21filtered_Bs2DsstPi_Signal_dw.root
-Filter-s21filtered_Bs2DsstPi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstPi PhiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter-s21filtered_Bs2DsstPi_Signal_dw.root
-Filter-s21filtered_Bs2DsstPi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstPi KstK 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter-s21filtered_Bs2DsstPi_Signal_dw.root
-Filter-s21filtered_Bs2DsstPi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstPi KPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter-s21filtered_Bs2DsstPi-K2Pi_Signal_dw.root
-Filter-s21filtered_Bs2DsstPi-K2Pi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstPi PiPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter-s21filtered_Bs2DsstPi-K2Pi_Signal_dw.root
-Filter-s21filtered_Bs2DsstPi-K2Pi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstPi NonRes 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter-s21_Bs2DsstPi_Signal_dw.root
-Filter-s21_Bs2DsstPi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstPi PhiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter11-s21filtered_Bs2DsstPi_Signal_dw.root
-Filter11-s21filtered_Bs2DsstPi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstPi KstK 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter11-s21filtered_Bs2DsstPi_Signal_dw.root
-Filter11-s21filtered_Bs2DsstPi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstPi KPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter11-s21filtered_Bs2DsstPi-K2Pi_Signal_dw.root
-Filter11-s21filtered_Bs2DsstPi-K2Pi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstPi PiPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter11-s21filtered_Bs2DsstPi-3Pi_Signal_dw.root
-Filter11-s21filtered_Bs2DsstPi-3Pi_Signal_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial NonRes 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-FilterRun1-s21_Bs2DsstPi_Data_dw.root
-FilterRun1-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial NonRes 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-FilterRun1-s21_Bs2DsstPi_Data_dw.root
-FilterRun1-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial PhiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-FilterRun1-s21_Bs2DsstPi_Data_dw.root
-FilterRun1-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial PhiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-FilterRun1-s21_Bs2DsstPi_Data_dw.root
-FilterRun1-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial KstK 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-FilterRun1-s21_Bs2DsstPi_Data_dw.root
-FilterRun1-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial KstK 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-FilterRun1-s21_Bs2DsstPi_Data_dw.root
-FilterRun1-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial KPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-FilterRun1-s21_Bs2DsstPi-K2Pi_Data_dw.root
-FilterRun1-s21_Bs2DsstPi-K2Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial KPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-FilterRun1-s21_Bs2DsstPi-K2Pi_Data_dw.root
-FilterRun1-s21_Bs2DsstPi-K2Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial PiPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-FilterRun1-s21_Bs2DsstPi-3Pi_Data_dw.root
-FilterRun1-s21_Bs2DsstPi-3Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial PiPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-FilterRun1-s21_Bs2DsstPi-3Pi_Data_dw.root
-FilterRun1-s21_Bs2DsstPi-3Pi_Data_up.root
-tuple
-tuple
-###
-
-#RatioDataMC 2011 PNTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PNTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-#PIDK Pion 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21r1_2011_MagDown_nTracks_P.root
-Pi_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Pion 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21_2012_MagDown_nTracks_P.root
-Pi_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21r1_2011_MagDown_nTracks_P.root
-K_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21_2012_MagDown_nTracks_P.root
-K_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Proton 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21r1_2011_MagDown_nTracks_P.root
-P_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Proton 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21_2012_MagDown_nTracks_P.root
-P_Strip21_2012_MagUp_nTracks_P.root
-###
diff --git a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/config_Bs2DsstPi_shunan.txt b/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/config_Bs2DsstPi_shunan.txt
deleted file mode 100644
index 4155ac8d25d6a15fcc2391e61d70df6e28d6d909..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsstK_3fbCPV/Bs2DsstPi/config_Bs2DsstPi_shunan.txt
+++ /dev/null
@@ -1,340 +0,0 @@
-
-#Bs2DsstPi NonRes 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter11-s21_Bs2DsstPi_Data_dw.root
-Filter11-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi NonRes 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter12-s21_Bs2DsstPi_Data_dw.root
-Filter12-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi PhiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter11-s21_Bs2DsstPi_Data_dw.root
-Filter11-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi PhiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter12-s21_Bs2DsstPi_Data_dw.root
-Filter12-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi KstK 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter11-s21_Bs2DsstPi_Data_dw.root
-Filter11-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi KstK 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter12-s21_Bs2DsstPi_Data_dw.root
-Filter12-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi KPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter11-s21_Bs2DsstPi-K2Pi_Data_dw.root
-Filter11-s21_Bs2DsstPi-K2Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi KPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter12-s21_Bs2DsstPi-K2Pi_Data_dw.root
-Filter12-s21_Bs2DsstPi-K2Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi PiPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter11-s21_Bs2DsstPi-3Pi_Data_dw.root
-Filter11-s21_Bs2DsstPi-3Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi PiPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter12-s21_Bs2DsstPi-3Pi_Data_dw.root
-Filter12-s21_Bs2DsstPi-3Pi_Data_up.root
-tuple
-tuple
-###
-
-#MC FileName KKPi MD 2012
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bs2Dsrho_dw.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bs2Dsstrho_dw.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
- {"Mode":"Bd2DsstPi",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bd2DsstPi_dw.root",
- "TreeName":"tuple;1"}
-###
-
-#MC FileName KKPi MU 2012
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bs2Dsrho_up.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bs2Dsstrho_up.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
- {"Mode":"Bd2DsstPi",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bd2DsstPi_up.root",
- "TreeName":"tuple;1"}
-###
-
-#MC FileName KKPi MD 2011
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bs2Dsrho_dw.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bs2Dsstrho_dw.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
- {"Mode":"Bd2DsstPi",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bd2DsstPi_dw.root",
- "TreeName":"tuple;1"}
-###
-
-#MC FileName KKPi MU 2011
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bs2Dsrho_up.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bs2Dsstrho_up.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
- {"Mode":"Bd2DsstPi",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bd2DsstPi_up.root",
- "TreeName":"tuple;1"}
-###
-
-#Signal Bs2DsstPi NonRes 2012
-/afs/cern.ch/work/s/shunan/public/Bs2DsstPi/MC/
-Filter-s21_Bs2DsstPi_Signal_dw.root
-Filter-s21_Bs2DsstPi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstPi PhiPi 2012
-/afs/cern.ch/work/s/shunan/public/Bs2DsstPi/MC/
-Filter-s21_Bs2DsstPi_Signal_dw.root
-Filter-s21_Bs2DsstPi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstPi KstK 2012
-/afs/cern.ch/work/s/shunan/public/Bs2DsstPi/MC/
-Filter-s21_Bs2DsstPi_Signal_dw.root
-Filter-s21_Bs2DsstPi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstPi KPiPi 2012
-/afs/cern.ch/work/s/shunan/public/Bs2DsstPi/MC/
-Filter-s21_Bs2DsstPi-K2Pi_Signal_dw.root
-Filter-s21_Bs2DsstPi-K2Pi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstPi PiPiPi 2012
-/afs/cern.ch/work/s/shunan/public/Bs2DsstPi/MC/
-Filter-s21_Bs2DsstPi-3Pi_Signal_dw.root
-Filter-s21_Bs2DsstPi-3Pi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstPi NonRes 2011
-/afs/cern.ch/work/s/shunan/public/Bs2DsstPi/MC/
-Filter-s21_Bs2DsstPi_Signal_dw.root
-Filter-s21_Bs2DsstPi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstPi PhiPi 2011
-/afs/cern.ch/work/s/shunan/public/Bs2DsstPi/MC/
-Filter11-s21_Bs2DsstPi_Signal_dw.root
-Filter11-s21_Bs2DsstPi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstPi KstK 2011
-/afs/cern.ch/work/s/shunan/public/Bs2DsstPi/MC/
-Filter11-s21_Bs2DsstPi_Signal_dw.root
-Filter11-s21_Bs2DsstPi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstPi KPiPi 2011
-/afs/cern.ch/work/s/shunan/public/Bs2DsstPi/MC/
-Filter11-s21_Bs2DsstPi-K2Pi_Signal_dw.root
-Filter11-s21_Bs2DsstPi-K2Pi_Signal_up.root
-tuple
-tuple
-###
-
-#Signal Bs2DsstPi PiPiPi 2011
-/afs/cern.ch/work/s/shunan/public/Bs2DsstPi/MC/
-Filter11-s21_Bs2DsstPi-3Pi_Signal_dw.root
-Filter11-s21_Bs2DsstPi-3Pi_Signal_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial NonRes 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-FilterRun1-s21_Bs2DsstPi_Data_dw.root
-FilterRun1-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial NonRes 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-FilterRun1-s21_Bs2DsstPi_Data_dw.root
-FilterRun1-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial PhiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-FilterRun1-s21_Bs2DsstPi_Data_dw.root
-FilterRun1-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial PhiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-FilterRun1-s21_Bs2DsstPi_Data_dw.root
-FilterRun1-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial KstK 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-FilterRun1-s21_Bs2DsstPi_Data_dw.root
-FilterRun1-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial KstK 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-FilterRun1-s21_Bs2DsstPi_Data_dw.root
-FilterRun1-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial KPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-FilterRun1-s21_Bs2DsstPi-K2Pi_Data_dw.root
-FilterRun1-s21_Bs2DsstPi-K2Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial KPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-FilterRun1-s21_Bs2DsstPi-K2Pi_Data_dw.root
-FilterRun1-s21_Bs2DsstPi-K2Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial PiPiPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-FilterRun1-s21_Bs2DsstPi-3Pi_Data_dw.root
-FilterRun1-s21_Bs2DsstPi-3Pi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial PiPiPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-FilterRun1-s21_Bs2DsstPi-3Pi_Data_dw.root
-FilterRun1-s21_Bs2DsstPi-3Pi_Data_up.root
-tuple
-tuple
-###
-
-#RatioDataMC 2011 PNTr
-/afs/cern.ch/work/s/shunan/public/Bs2DsstK/dataMC/
-dataMC_DsstPi_2011_dw.root
-dataMC_DsstPi_2011_up.root
-###
-
-#RatioDataMC 2012 PNTr
-/afs/cern.ch/work/s/shunan/public/Bs2DsstK/dataMC/
-dataMC_DsstPi_2012_dw.root
-dataMC_DsstPi_2012_up.root
-###
-
-#PIDK Pion 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21r1_2011_MagDown_nTracks_P.root
-Pi_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Pion 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21_2012_MagDown_nTracks_P.root
-Pi_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21r1_2011_MagDown_nTracks_P.root
-K_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21_2012_MagDown_nTracks_P.root
-K_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Proton 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21r1_2011_MagDown_nTracks_P.root
-P_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Proton 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21_2012_MagDown_nTracks_P.root
-P_Strip21_2012_MagUp_nTracks_P.root
-###
diff --git a/PhysFit/B2DXFitters/data/Bs2DsstPiConfigForNominalMassFit2.py b/PhysFit/B2DXFitters/data/Bs2DsstPiConfigForNominalMassFit2.py
deleted file mode 100644
index 0f76e2d173f3282cec7eeefaf52274e7ad71797d..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/Bs2DsstPiConfigForNominalMassFit2.py
+++ /dev/null
@@ -1,230 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bs2DsstPi"
-    configdict["CharmModes"] = {"NonRes", "PhiPi", "KstK"}
-    # year of data taking                                                                                 
-    configdict["YearOfDataTaking"] = {"2012"} #, "2011"}
-    # stripping (necessary in case of PIDK shapes)                               
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)
-    configdict["IntegratedLuminosity"] = {"2011":{"Down": 0.59, "Up": 0.44}, "2012":{"Down": 0.59, "Up": 0.44}}
-    # file name with paths to MC/data samples                                     
-    configdict["dataName"]   = "../data/Bs2DsstK_3fbCPV/config_Bs2DsstPi.txt"
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5100,    6000    ], "InputName" : "FBs_DeltaM_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [2080,    2150    ], "InputName" : "FDsstr_DeltaM_M"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.0,     1.e+9   ], "InputName" : "FBs_LF_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [1000.,   650000.0], "InputName" : "FBac_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [1000.,   45000.0 ], "InputName" : "FBac_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [0.0,     150,    ], "InputName" : "FBac_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.,     1000.0  ], "InputName" : "FnTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.0,     1.e+9   ], "InputName" : "FBs_LF_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "FBac_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.025,   1.0     ], "InputName" : "FBDT_Var"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "FBs_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "FBs_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [0.0,     0.5     ], "InputName" : "FBs_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [0.0,     0.5     ], "InputName" : "FBs_SS_nnetKaon_PROB"}
-
-    # tagging calibration                                                                                               
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3834, "p1": 0.9720, "average": 0.3813}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4244, "p1": 1.2180, "average": 0.4097}
-
-    # additional cuts applied to data sets
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "FDs_M>1950.&&FDs_M<1990.&&FDs_FDCHI2_ORIVX>2.&&FDelta_M>111.5&&FDelta_M<181.5&&FBs_Veto==0.&&FBDT_Var>0.025",
-                                               "MC":   "FDs_M>1950.&&FDs_M<1990.&&FDs_FDCHI2_ORIVX>2.&&FDelta_M>111.5&&FDelta_M<181.5&&FBs_Veto==0.&&FBDT_Var>0.025"}
-    configdict["AdditionalCuts"]["NonRes"] = { "Data":"FDs_Dec==3", "MC":"FDs_Dec==3"}
-    configdict["AdditionalCuts"]["PhiPi"]  = { "Data":"FDs_Dec==1", "MC":"FDs_Dec==1"}
-    configdict["AdditionalCuts"]["KstK"]   = { "Data":"FDs_Dec==2", "MC":"FDs_Dec==2"}
- 
-    configdict["CreateRooKeysPdfForCombinatorial"] = {}
-    configdict["CreateRooKeysPdfForCombinatorial"]["BeautyMass"] = {} 
-    configdict["CreateRooKeysPdfForCombinatorial"]["BeautyMass"]["All"]    = {"Cut":"FBs_DeltaM_M>5100&&FDs_M>1950.&&FDs_M<1990.&&FDs_FDCHI2_ORIVX>2.&&FDelta_M>205.&&FDelta_M<215.&&FBs_Veto==0.&&FBDT_Var>0.025&&FBac_P>1000.0&&FBac_P<650000.0&&FBac_PT>1000.0&&FBac_PT<45000.0",
-                                                                              "Rho":2.0, "Mirror":"LeftAsymRigh"}
-    configdict["CreateRooKeysPdfForCombinatorial"]["BeautyMass"]["NonRes"] = {"Cut":"FDs_Dec==3"}
-    configdict["CreateRooKeysPdfForCombinatorial"]["BeautyMass"]["PhiPi"]  = {"Cut":"FDs_Dec==1"}
-    configdict["CreateRooKeysPdfForCombinatorial"]["BeautyMass"]["KstK"]   = {"Cut":"FDs_Dec==2"}
-        
-    #weighting for PID templates                                                                                                                                                    
-    configdict["ObtainPIDTemplates"] = { "Variables":["BacPT","nTracks"], "Bins":[20,20] }
-
-    #PID Calibration samples for PID shapes
-    configdict["Calibrations"] = {}
-    configdict["Calibrations"]["2011"] = {}
-    configdict["Calibrations"]["2011"]["Pion"]   = {}
-    configdict["Calibrations"]["2011"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID0_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID0_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]   = {}
-    configdict["Calibrations"]["2011"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID0_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID0_Str20r1.root"}
-    configdict["Calibrations"]["2011"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Up"] = { "FileName":"",
-                                                                  "WorkName":"workspace", "DataName":"dataSetCombPi_BeautyMass", "Type":"Workspace",
-                                                                  "WeightName":"", "PIDVarName":"BacPIDK", "Variables":["BacPT","nTracks"]}
-    configdict["Calibrations"]["2011"]["Combinatorial"]["Down"] = { "FileName":"",
-                                                                  "WorkName":"workspace", "DataName":"dataSetCombPi_BeautyMass", "Type":"Workspace",
-                                                                  "WeightName":"", "PIDVarName":"BacPIDK", "Variables":["BacPT","nTracks"]}
-
-
-    configdict["Calibrations"]["2012"] = {}
-    configdict["Calibrations"]["2012"]["Pion"]   = {}
-    configdict["Calibrations"]["2012"]["Pion"]["Up"]   = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_Pi_PID0_Str20.root"}
-    configdict["Calibrations"]["2012"]["Pion"]["Down"] = {"FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_Pi_PID0_Str20.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]   = {}
-    configdict["Calibrations"]["2012"]["Kaon"]["Up"]   = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Up_K_PID0_Str20.root"}
-    configdict["Calibrations"]["2012"]["Kaon"]["Down"] = { "FileName":"/afs/cern.ch/work/a/adudziak/public/workspace/CalibrationSamples/CalibDst_Down_K_PID0_Str20.root"}
-    configdict["Calibrations"]["2012"]["Combinatorial"]   = {}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Up"] = { "FileName":"",
-                                                                  "WorkName":"workspace", "DataName":"dataSetCombPi_BeautyMass", "Type":"Workspace",
-                                                                  "WeightName":"", "PIDVarName":"BacPIDK", "Variables":["BacPT","nTracks"]}
-    configdict["Calibrations"]["2012"]["Combinatorial"]["Down"] = { "FileName":"",
-                                                                  "WorkName":"workspace", "DataName":"dataSetCombPi_BeautyMass", "Type":"Workspace",
-                                                                  "WeightName":"", "PIDVarName":"BacPIDK", "Variables":["BacPT","nTracks"]}
-
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"All":5.36878e+03}
-    configdict["BsSignalShape"]["sigma1"]  = {"2012": {"NonRes":2.88070e+01, "PhiPi":2.88070e+01, "KstK":2.88070e+01, "KPiPi":2.88070e+01, "PiPiPi":2.88070e+01},
-                                              "2011": {"NonRes":28.8, "PhiPi":28.8, "KstK":28.8, "KPiPi":28.8, "PiPiPi":28.8}, "Fixed":True}
-    configdict["BsSignalShape"]["sigma2"]  = {"2012": {"NonRes":1.64247e+01, "PhiPi":1.64247e+01, "KstK":1.64247e+01, "KPiPi":1.64247e+01, "PiPiPi":1.64247e+01},
-                                              "2011": {"NonRes":16.4, "PhiPi":16.4, "KstK":16.4, "KPiPi":16.4, "PiPiPi":16.4}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha1"]  = {"2012": {"NonRes":1.64214e+00, "PhiPi":1.64214e+00, "KstK":1.64214e+00, "KPiPi":1.64214e+00, "PiPiPi":1.64214e+00},
-                                              "2011": {"NonRes":1.64, "PhiPi":1.64, "KstK":1.64, "KPiPi":1.64, "PiPiPi":1.64}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha2"]  = {"2012": {"NonRes":-2.96373e+00, "PhiPi":-2.96373e+00, "KstK":-2.96373e+00, "KPiPi":-2.96373e+00, "PiPiPi":-2.96373e+00},
-                                              "2011": {"NonRes":-2.9, "PhiPi":-2.9, "KstK":-2.9, "KPiPi":-2.9, "PiPiPi":-2.9}, "Fixed":True}
-    configdict["BsSignalShape"]["n1"]      = {"2012": {"NonRes":1.26124e+00, "PhiPi":1.26124e+00, "KstK":1.26124e+00, "KPiPi":1.26124e+00, "PiPiPi":1.26124e+00},
-                                              "2011": {"NonRes":126., "PhiPi":126., "KstK":126., "KPiPi":126., "PiPiPi":126.},  "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"2012": {"NonRes":1.00558e+00, "PhiPi":1.00558e+00, "KstK":1.00558e+00, "KPiPi":1.00558e+00, "PiPiPi":1.00558e+00},
-                                              "2011": {"NonRes":1.00, "PhiPi":1.00, "KstK":1.00, "KPiPi":1.00, "PiPiPi":1.00},  "Fixed":True}
-    configdict["BsSignalShape"]["frac"]    = {"2012": {"NonRes":3.37315e-01, "PhiPi":3.37315e-01, "KstK":3.37315e-01, "KPiPi":3.37315e-01, "PiPiPi":3.37315e-01},
-                                              "2011": {"NonRes":0.33, "PhiPi":0.33, "KstK":0.33, "KPiPi":0.33, "PiPiPi":0.33}, "Fixed":True}
-
-    #configdict["BsSignalShape"] = {}
-    #configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    #configdict["BsSignalShape"]["mean"]    = {"All":5367.51}
-    #configdict["BsSignalShape"]["sigma1"]  = {"2012": {"All":2.80080e+01},    "2011": {"All":2.80080e+01}, "Fixed":True}
-    #configdict["BsSignalShape"]["sigma2"]  = {"2012": {"All":2.00892e+01},    "2011": {"All":2.00892e+01}, "Fixed":True}
-    #configdict["BsSignalShape"]["alpha1"]  = {"2012": {"All":1.87906e+00},    "2011": {"All":1.87906e+00},  "Fixed":True}
-    #configdict["BsSignalShape"]["alpha2"]  = {"2012": {"All":-2.45124e+00},   "2011": {"All":-2.45124e+00}, "Fixed":True}
-    #configdict["BsSignalShape"]["n1"]      = {"2012": {"All":1.24093e+00},    "2011": {"All":1.24093e+00}, "Fixed":True}
-    #configdict["BsSignalShape"]["n2"]      = {"2012": {"NonRes":1.00000e+01}, "2011": {"NonRes":1.00000e+01}, "Fixed":True}
-    #configdict["BsSignalShape"]["frac"]    = {"2012": {"NonRes":4.66783e-01}, "2011": {"NonRes":4.66783e-01}, "Fixed":True}
-    
-    # Ds signal shapes
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"All":2.11000e+03}
-    configdict["DsSignalShape"]["sigma1"]  = {"2012": {"NonRes":1.20976e+01, "PhiPi":1.20976e+01, "KstK":1.20976e+01, "KPiPi":1.20976e+01, "PiPiPi":1.20976e+01},
-                                              "2011": {"NonRes":12.0, "PhiPi":12.0, "KstK":12.0, "KPiPi":12.0, "PiPiPi":12.0}, "Fixed":True}
-    configdict["DsSignalShape"]["sigma2"]  = {"2012": {"NonRes":5.94917e+00, "PhiPi":5.94917e+00, "KstK":5.94917e+00, "KPiPi":5.94917e+00, "PiPiPi":5.94917e+00},
-                                              "2011": {"NonRes":5.94, "PhiPi":5.94, "KstK":5.94, "KPiPi":5.94, "PiPiPi":5.94}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha1"]  = {"2012": {"NonRes":1.40152e+00, "PhiPi":1.40152e+00, "KstK":1.40152e+00, "KPiPi":1.40152e+00, "PiPiPi":1.40152e+00},
-                                              "2011": {"NonRes":1.40, "PhiPi":1.40, "KstK":1.40, "KPiPi":1.40, "PiPiPi":1.40}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha2"]  = {"2012": {"NonRes":-2.98478e-01, "PhiPi":-2.98478e-01, "KstK":-2.98478e-01, "KPiPi":-2.98478e-01, "PiPiPi":-2.98478e-01},
-                                              "2011": {"NonRes":-0.2, "PhiPi":-0.2, "KstK":-0.2, "KPiPi":-0.2, "PiPiPi":-0.2}, "Fixed":True}
-    configdict["DsSignalShape"]["n1"]      = {"2012": {"NonRes":1.44311e+02, "PhiPi":1.44311e+02, "KstK":1.44311e+02, "KPiPi":1.44311e+02, "PiPiPi":1.44311e+02},
-                                              "2011": {"NonRes":144., "PhiPi":144., "KstK":144., "KPiPi":144., "PiPiPi":144.}, "Fixed":True}
-    configdict["DsSignalShape"]["n2"]      = {"2012": {"NonRes":2.83105e+00, "PhiPi":2.83105e+00, "KstK":2.83105e+00, "KPiPi":2.83105e+00, "PiPiPi":2.83105e+00},
-                                              "2011": {"NonRes":2.83, "PhiPi":2.83, "KstK":2.83, "KPiPi":2.83, "PiPiPi":2.83}, "Fixed":True}
-    configdict["DsSignalShape"]["frac"]    = {"2012": {"NonRes":5.66652e-01, "PhiPi":5.66652e-01, "KstK":5.66652e-01, "KPiPi":5.66652e-01, "PiPiPi":5.66652e-01},
-                                              "2011": {"NonRes":0.56, "PhiPi":0.56, "KstK":0.56, "KPiPi":0.56, "PiPiPi":0.56}, "Fixed":True}
-
-    #configdict["DsSignalShape"] = {}
-    #configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    #configdict["DsSignalShape"]["mean"]    = {"All":2110.0}
-    #configdict["DsSignalShape"]["sigma1"]  = {"2012": {"NonRes":1.2354e+01,  "PhiPi":1.2354e+01,  "KstK":1.2354e+01},  
-    #                                          "2011": {"NonRes":1.2354e+01,  "PhiPi":1.2354e+01,  "KstK":1.2354e+01}, "Fixed":True}
-    #configdict["DsSignalShape"]["sigma2"]  = {"2012": {"NonRes":5.8237e+00,  "PhiPi":5.8237e+00,  "KstK":5.8237e+00},
-    #                                          "2011": {"NonRes":5.8237e+00,  "PhiPi":5.8237e+00,  "KstK":5.8237e+00}, "Fixed":True}
-    #configdict["DsSignalShape"]["alpha1"]  = {"2012": {"NonRes":1.5841e+00,  "PhiPi":1.5841e+00,  "KstK":1.5841e+00},
-    #                                          "2011": {"NonRes":1.5841e+00,  "PhiPi":1.5841e+00,  "KstK":1.5841e+00},  "Fixed":True}
-    #configdict["DsSignalShape"]["alpha2"]  = {"2012": {"NonRes":-3.4618e-01, "PhiPi":-3.4618e-01, "KstK":-3.4618e-01}, 
-    #                                          "2011": {"NonRes":-3.4618e-01, "PhiPi":-3.4618e-01, "KstK":-3.4618e-01}, "Fixed":True}
-    #configdict["DsSignalShape"]["n1"]      = {"2012": {"NonRes":1.5304e+02,  "PhiPi":1.5304e+02,  "KstK":1.5304e+02},
-    #                                          "2011": {"NonRes":1.5304e+02,  "PhiPi":1.5304e+02,  "KstK":1.5304e+02},  "Fixed":True}
-    #configdict["DsSignalShape"]["n2"]      = {"2012": {"NonRes":1.3448e+00,  "PhiPi":1.3448e+00,  "KstK":1.3448e+00},  
-    #                                          "2011": {"NonRes":1.3448e+00,  "PhiPi":1.3448e+00,  "KstK":1.3448e+00},  "Fixed":True}
-    #configdict["DsSignalShape"]["frac"]    = {"2012": {"NonRes":5.8411e-01,  "PhiPi":5.8411e-01,  "KstK":5.8411e-01},
-    #                                          "2011": {"NonRes":5.8411e-01,  "PhiPi":5.8411e-01,  "KstK":5.8411e-01}, "Fixed":True}
-
-    # combinatorial background              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"] = "ExponentialPlusGauss"
-    configdict["BsCombinatorialShape"]["cB"]         = {"2012": {"NonRes":-0.0036,     "PhiPi":-0.00317006, "KstK":-0.00368556}, 
-                                                        "2011": {"NonRes":-0.0036,     "PhiPi":-0.00317006, "KstK":-0.00368556},   "Fixed":False}
-    configdict["BsCombinatorialShape"]["fracCombB"]  = {"2012": {"NonRes":0.25,        "PhiPi":0.2,         "KstK":0.2}, 
-                                                        "2011": {"NonRes":0.25,        "PhiPi":0.2,         "KstK":0.2},           "Fixed":True}
-    configdict["BsCombinatorialShape"]["meanComb"]   = {"2012": {"NonRes":5212.03,     "PhiPi":5229.96,     "KstK":5219.37},
-                                                        "2011": {"NonRes":5212.03,     "PhiPi":5229.96,     "KstK":5219.37},       "Fixed":True}
-    configdict["BsCombinatorialShape"]["widthComb"]  = {"2012": {"NonRes":211.266,     "PhiPi":163.297,     "KstK":170.787},
-                                                        "2011": {"NonRes":211.266,     "PhiPi":163.297,     "KstK":170.787},       "Fixed":True}
-    #configdict["BsCombinatorialShape"]["type"] = "RooKeysPdf"
-    #configdict["BsCombinatorialShape"]["name"] = {"2012": {"NonRes":"PhysBkgCombPi_BeautyMassPdf_m_both_nonres_2012",
-    #                                                       "PhiPi": "PhysBkgCombPi_BeautyMassPdf_m_both_phipi_2012",
-    #                                                       "KstK": "PhysBkgCombPi_BeautyMassPdf_m_both_kstk_2012"},
-    #                                              "2011": {"NonRes":"PhysBkgCombPi_BeautyMassPdf_m_both_nonres_2011",
-    #                                                       "PhiPi": "PhysBkgCombPi_BeautyMassPdf_m_both_phipi_2011",
-    #                                                       "KstK": "PhysBkgCombPi_BeautyMassPdf_m_both_kstk_2011"}}
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" 
-    configdict["DsCombinatorialShape"]["cD"]        = {"2012": {"NonRes":-0.05,       "PhiPi":-0.05,       "KstK":-0.05}, 
-                                                       "2011": {"NonRes":-0.05,       "PhiPi":-0.05,       "KstK":-0.05}, "Fixed":False}
-    configdict["DsCombinatorialShape"]["fracCombD"] = {"2012": {"NonRes":0.5,         "PhiPi":0.5,         "KstK":0.5}, 
-                                                       "2011": {"NonRes":0.5,         "PhiPi":0.5,         "KstK":0.5},     "Fixed":False}
-
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK"]   = { "2011":{"fracPIDK1_2011":0.5}, "2012":{"fracPIDK1_2012":0.5},  "Fixed":False }
-
-    #expected yields                                                                                                                                                       
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bs2DsstRho"] = {"2012": { "NonRes":10000.0, "PhiPi":40000.0, "KstK":20000.0},  
-                                          "2011": { "NonRes":10000.0, "PhiPi":40000.0, "KstK":20000.0}, "Fixed":False}
-    configdict["Yields"]["Bd2DsstPi"] = {"2012": { "NonRes":10000.0, "PhiPi":40000.0, "KstK":20000.0},
-                                         "2011": { "NonRes":10000.0, "PhiPi":40000.0, "KstK":20000.0}, "Fixed":False}
-    configdict["Yields"]["Bs2DsRho"]   = {"2012": { "NonRes":10000.0, "PhiPi":40000.0, "KstK":20000.0},
-                                          "2011": { "NonRes":10000.0, "PhiPi":40000.0, "KstK":20000.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]    = {"2012": { "NonRes":10000.0, "PhiPi":40000.0, "KstK":20000.0},
-                                          "2011": { "NonRes":10000.0, "PhiPi":40000.0, "KstK":20000.0}, "Fixed":False}
-    configdict["Yields"]["Signal"]     = {"2012": { "NonRes":10000.0, "PhiPi":40000.0, "KstK":20000.0},
-                                          "2011": { "NonRes":10000.0, "PhiPi":40000.0, "KstK":20000.0}, "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bd2DsstPi", "Bs2DsRho", "Bs2DsstRho"]
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kBlue-10, kGreen+3]
-
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66], 
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/SignalConfigForFit.py b/PhysFit/B2DXFitters/data/SignalConfigForFit.py
deleted file mode 100644
index 7add7dd2ccf86591288c91a63b5467bad8399b95..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/SignalConfigForFit.py
+++ /dev/null
@@ -1,113 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-    
-    # considered decay mode
-    configdict["Decay"] = "Bs2DsK"
-    configdict["CharmModes"] = {"NonRes","PhiPi","KstK","KPiPi","PiPiPi"} 
-    # year of data taking
-    configdict["YearOfDataTaking"] = {"2011"} 
-    # stripping (necessary in case of PIDK shapes)
-    configdict["Stripping"] = {"2011":"17"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes) 
-    configdict["IntegratedLuminosity"] = {"2011": {"Down": 0.59, "Up": 0.44}}
-    # file name with paths to MC/data samples
-    configdict["dataName"]   = "../data/config_Bs2Dsh2011TDAna_Bs2DsK.txt"
-        
-    # basic variables
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5420    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BeautyTime"]    = { "Range" : [0.4,     15.0    ], "InputName" : "lab0_LifetimeFit_ctau"}
-    configdict["BasicVariables"]["BacP"]          = { "Range" : [3000.0,  650000.0], "InputName" : "lab1_P"}
-    configdict["BasicVariables"]["BacPT"]         = { "Range" : [400.0,   45000.0 ], "InputName" : "lab1_PT"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [1.61,    5.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["nTracks"]       = { "Range" : [15.0,    1000.0  ], "InputName" : "nTracks"}
-    configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01,    0.1     ], "InputName" : "lab0_LifetimeFit_ctauErr"}
-    configdict["BasicVariables"]["BacCharge"]     = { "Range" : [-1000.0, 1000.0  ], "InputName" : "lab1_ID"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.3,     1.0     ], "InputName" : "BDTGResponse_1"}
-    configdict["BasicVariables"]["TagDecOS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_TAGDECISION_OS"}
-    configdict["BasicVariables"]["TagDecSS"]      = { "Range" : [-1.0,    1.0     ], "InputName" : "lab0_SS_nnetKaon_DEC"}
-    configdict["BasicVariables"]["MistagOS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_TAGOMEGA_OS"}
-    configdict["BasicVariables"]["MistagSS"]      = { "Range" : [ 0.0,    0.5     ], "InputName" : "lab0_SS_nnetKaon_PROB"}
-
-    # tagging calibration
-    configdict["TaggingCalibration"] = {}
-    configdict["TaggingCalibration"]["OS"] = {"p0": 0.3834, "p1": 0.9720, "average": 0.3813}
-    configdict["TaggingCalibration"]["SS"] = {"p0": 0.4244, "p1": 1.2180, "average": 0.4097}
-
-    # additional cuts applied to data sets
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0",            "MC" : "lab2_TAU>0&&lab1_M>200", "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                     
-    # order of particles: KKPi, KPiPi, PiPiPi                                
-    configdict["DsChildrenPrefix"] = {"Child1":"lab5","Child2":"lab4","Child3": "lab3"}
-
-    #weighting templates by PID eff/misID                                                                                                                                              
-    configdict["WeightingMassTemplates"]= { "RatioDataMC":True }
-
-    #Signal shapes                                                                                                                                             
-    configdict["SignalShape"] = {}
-    configdict["SignalShape"]["type"]    = "DoubleCrystalBall"
-    configdict["SignalShape"]["mean"]    = {"All":5367.51}
-    configdict["SignalShape"]["sigma1"]  = {"2011": {"NonRes":1.0717e+01,  "PhiPi":1.1235e+01,  "KstK":1.0772e+01,  "KPiPi":1.1268e+01,  "PiPiPi":1.1391e+01}, "Fixed":False}
-    configdict["SignalShape"]["sigma2"]  = {"2011": {"NonRes":1.6005e+01,  "PhiPi":1.7031e+01,  "KstK":1.5339e+01,  "KPiPi":1.9408e+01,  "PiPiPi":1.7647e+01}, "Fixed":False}
-    configdict["SignalShape"]["alpha1"]  = {"2011": {"NonRes":2.2118e+00,  "PhiPi":2.2144e+00,  "KstK":2.0480e+00,  "KPiPi":2.3954e+00,  "PiPiPi":2.0930e+00}, "Fixed":True}
-    configdict["SignalShape"]["alpha2"]  = {"2011": {"NonRes":-2.4185e+00, "PhiPi":-2.1918e+00, "KstK":-2.0291e+00, "KPiPi":-3.4196e+00, "PiPiPi":-2.3295e+00}, "Fixed":True}
-    configdict["SignalShape"]["n1"]      = {"2011": {"NonRes":1.0019e+00,  "PhiPi":1.1193e+00,  "KstK":1.2137e+00,  "KPiPi":9.8202e-01,  "PiPiPi":1.2674e+00}, "Fixed":True}
-    configdict["SignalShape"]["n2"]      = {"2011": {"NonRes":3.1469e+00,  "PhiPi":3.6097e+00,  "KstK":6.5735e+00,  "KPiPi":5.2237e-01,  "PiPiPi":4.0195e+00}, "Fixed":True}
-    configdict["SignalShape"]["frac"]    = {"2011": {"NonRes":6.1755e-01,  "PhiPi":7.0166e-01,  "KstK":5.8012e-01,  "KPiPi":7.8103e-01,  "PiPiPi":7.0398e-01}, "Fixed":True}
-
-    # Bs signal shapes                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBall"
-    configdict["BsSignalShape"]["mean"]    = {"All":5367.51}
-    configdict["BsSignalShape"]["sigma1"]  = {"2011": {"NonRes":1.0717e+01,  "PhiPi":1.1235e+01,  "KstK":1.0772e+01,  "KPiPi":1.1268e+01,  "PiPiPi":1.1391e+01}, "Fixed":True}
-    configdict["BsSignalShape"]["sigma2"]  = {"2011": {"NonRes":1.6005e+01,  "PhiPi":1.7031e+01,  "KstK":1.5339e+01,  "KPiPi":1.9408e+01,  "PiPiPi":1.7647e+01}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha1"]  = {"2011": {"NonRes":2.2118e+00,  "PhiPi":2.2144e+00,  "KstK":2.0480e+00,  "KPiPi":2.3954e+00,  "PiPiPi":2.0930e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["alpha2"]  = {"2011": {"NonRes":-2.4185e+00, "PhiPi":-2.1918e+00, "KstK":-2.0291e+00, "KPiPi":-3.4196e+00, "PiPiPi":-2.3295e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["n1"]      = {"2011": {"NonRes":1.0019e+00,  "PhiPi":1.1193e+00,  "KstK":1.2137e+00,  "KPiPi":9.8202e-01,  "PiPiPi":1.2674e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["n2"]      = {"2011": {"NonRes":3.1469e+00,  "PhiPi":3.6097e+00,  "KstK":6.5735e+00,  "KPiPi":5.2237e-01,  "PiPiPi":4.0195e+00}, "Fixed":True}
-    configdict["BsSignalShape"]["frac"]    = {"2011": {"NonRes":6.1755e-01,  "PhiPi":7.0166e-01,  "KstK":5.8012e-01,  "KPiPi":7.8103e-01,  "PiPiPi":7.0398e-01}, "Fixed":True}
-
-    #Ds signal shapes                                                                                                
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBall"
-    configdict["DsSignalShape"]["mean"]    = {"All":1968.49}
-    configdict["DsSignalShape"]["sigma1"]  = {"2011": {"NonRes":5.3468e+00,  "PhiPi":8.2412e+00,  "KstK":6.0845e+00,  "KPiPi":8.8531e+00,  "PiPiPi":8.0860e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["sigma2"]  = {"2011": {"NonRes":5.1848e+00,  "PhiPi":4.4944e+00,  "KstK":5.1266e+00,  "KPiPi":5.2073e+00,  "PiPiPi":7.3773e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha1"]  = {"2011": {"NonRes":1.2252e+00,  "PhiPi":1.9827e+00,  "KstK":1.1316e+00,  "KPiPi":1.7131e+00,  "PiPiPi":9.0639e-01}, "Fixed":True}
-    configdict["DsSignalShape"]["alpha2"]  = {"2011": {"NonRes":-1.1167e+00, "PhiPi":-3.0525e+00, "KstK":-1.3760e+00, "KPiPi":-2.5276e+00, "PiPiPi":-1.1122e+00}, "Fixed":True}
-    configdict["DsSignalShape"]["n1"]      = {"2011": {"NonRes":4.6625e+00,  "PhiPi":1.4867e+00,  "KstK":1.3280e+01,  "KPiPi":2.0239e+00,  "PiPiPi":1.1486e+01}, "Fixed":True}
-    configdict["DsSignalShape"]["n2"]      = {"2011": {"NonRes":6.9989e+01,  "PhiPi":6.1022e-01,  "KstK":1.1017e+01,  "KPiPi":1.0860e+00,  "PiPiPi":4.0001e+01}, "Fixed":True}
-    configdict["DsSignalShape"]["frac"]    = {"2011": {"NonRes":4.7565e-01,  "PhiPi":3.9628e-01,  "KstK":4.0048e-01,  "KPiPi":5.5084e-01,  "PiPiPi":4.8729e-01}, "Fixed":True}
-
-    #expected yields                                                                          
-    configdict["Yields"] = {}
-    configdict["Yields"]["Signal"] = {"2011": {"NonRes":500000.0,  "PhiPi":500000.0, "KstK":500000.0, "KPiPi":500000.0, "PiPiPi":500000.0} , "Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                                                 
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------# 
- 
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig"]
-    configdict["PlotSettings"]["colors"] = [kBlue+2]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9]}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66], 
-                                                  "ScaleYSize":1.5, "SetLegendColumns":2, "LHCbTextSize":0.075}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/cFit/personality/2011Conf.py b/PhysFit/B2DXFitters/data/cFit/personality/2011Conf.py
deleted file mode 100644
index ffcd4415b08f856f74bce4aea1e95e598ebcc88d..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/cFit/personality/2011Conf.py
+++ /dev/null
@@ -1 +0,0 @@
-{ }
diff --git a/PhysFit/B2DXFitters/data/cFit/personality/2011ConfDATA.py b/PhysFit/B2DXFitters/data/cFit/personality/2011ConfDATA.py
deleted file mode 100644
index d1fd124c9a7e5a093fe62587121268f54176ed73..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/cFit/personality/2011ConfDATA.py
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-        'IsToy':        False,
-        'DataFileName': os.environ['B2DXFITTERSROOT'] + '/data/workspace/work_dsk.root',
-        'Blinding':     False,
-        }
diff --git a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsK-Agn116.py b/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsK-Agn116.py
deleted file mode 100644
index b469b7d65b4d21083cd8cb6f89faf6025658e848..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsK-Agn116.py
+++ /dev/null
@@ -1,302 +0,0 @@
-# personality for 2011 Paper - mode DsK toys in best fit point
-{
-	'UseKFactor': False,
-        'Modes': [
-            'Bs2DsK',
-            'Bs2DsKst',
-            'Bs2DsPi', 'Bs2DsstPi', 'Bs2DsRho',
-            'Bd2DK', 'Bd2DPi', 'Bd2DsK',
-            'Lb2LcK', 'Lb2LcPi', 'Lb2Dsp', 'Lb2Dsstp',
-            'CombBkg'
-            ],
-        'SampleCategories': [
-            'nonres', 'phipi', 'kstk', 'kpipi', 'pipipi'
-            ],
-	'DGsOverGs':                    -0.105/0.661, # DeltaGammas / Gammas
-        'DeltaMs':                      17.768, # in ps^{-1}
-        'GammaLb':			0.676, # in ps^{-1}
-        'WeakPhase': {
-            'Bs2DsK':           116. / 180. * pi,
-            'Bs2DsstK':         116. / 180. * pi,
-            'Bs2DsKst':         116. / 180. * pi,
-            'Bs2DsstKst':	116. / 180. * pi,
-            'Bd2DPi':           116. / 180. * pi
-            },
-        'StrongPhase': {
-            'Bs2DsK':           4. / 180. * pi,
-            'Bs2DsstK':         4. / 180. * pi,
-            'Bs2DsKst':         4. / 180. * pi,
-            'Bs2DsstKst':       4. / 180. * pi,
-            'Bd2DPi':           20. / 180. * pi
-            },
-        'ModLf': {
-	    'Bs2DsK': 	  0.51,
-	    'Bs2DsstK':   0.51,
-	    'Bs2DsKst':   0.51,
-	    'Bs2DsstKst': 0.51,
-	    'Bd2DPi':     0.015
-	    },
-        'CombineModesForEffCPObs': [ ],
-        'NEvents':			[ 2996. ],
-        'DataFileName':         ('/afs/cern.ch/work/a/adudziak/public/Bs2DsKToys/Gamma116_FinalForPaper1fb_3/MassFitResults/DsK_Toys_Work_ForMassPlot_%d.root' if haveAFS else
-            os.environ['B2DXFITTERSROOT']+'/scripts/paperv3b-dsk-agn116/data/DsK_Toys_Work_ForMassPlot_%d.root') % TOY_NUMBER,
-        'DataWorkSpaceName':    'FitMeToolWS',
-        'DataSetNames':         'combData',
-	'DataSetVarNameMapping': {
-	    'sample':   'sample',
-	    'mass':     'lab0_MassFitConsD_M',
-	    'pidk':     'lab1_PIDK',
-            'dsmass':   'lab2_MM',
-            'time':     'lab0_LifetimeFit_ctau',
-            'timeerr':  'lab0_LifetimeFit_ctauErr',
-            'mistag':   'tagOmegaComb',
-            'qf':       'lab1_ID',
-            'qt':       'tagDecComb',
-            'weight':   'nSig_both_nonres_Evts_sw+nSig_both_phipi_Evts_sw+nSig_both_kstk_Evts_sw+nSig_both_kpipi_Evts_sw+nSig_both_pipipi_Evts_sw'
-            },
-	'GammaCombBkg':     [0.745,0.913,1.451,1.371],
-	'DGammaCombBkg':    [0.753,0.845,1.266,1.282],
-	'CombBkg_D':	    [-0.938,-0.908,-0.775,-0.913],
-        'FitRanges': {
-		'time':     [0.4, 15.],
-		'timeerr':  [1e-6, 0.25],
-		'mistag':   [0., 0.5],
-		'mass':     [5320., 5420.],
-		'dsmass':   [1930., 2015.],
-		'pidk':     [0., 150.]
-		},
-        'MassTemplateFile':             ('/afs/cern.ch/work/a/adudziak/public/Bs2DsKToys/Gamma116_FinalForPaper1fb_3/MassFitResults/DsK_Toys_Work_ForMassPlot_%d.root' if haveAFS else
-            os.environ['B2DXFITTERSROOT']+'/scripts/paperv3b-dsk-agn116/data/DsK_Toys_Work_ForMassPlot_%d.root') % TOY_NUMBER,
-        'MassTemplateWorkspace':	'FitMeToolWS',
-        'MassInterpolation':		False,
-        'NTaggers':                     3,
-        'TagEff':                    {
-            'Bs2DsK': [ 0.3870 * (1. - 0.4772), 0.4772 * (1. - 0.3870), 0.3870 * 0.4772 ],
-            'Lb': [ 0.3870, 0.4772 ],
-            'Bd': [ 0.3870, 0.4772 ],
-	    'CombBkg': [ 0.594, 0.462 ],
-            },
-        'MistagTemplates': {
-            'Bs2DsK': [
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_3',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            'Bd2DPi': [
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BDPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BDPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BDPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            'CombBkg': [
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_3',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            },
-        'MistagCalibrationParams': {
-                'Bs2DsK': [
-                    [ [ 0., 1., 0. ] ],
-                    [ [ 0., 1., 0. ] ],
-                    [ [ 0., 1., 0. ] ],
-                    ],
-                'Bd': [
-                    [ [ 0., 1., 0. ] ],
-                    [ [ 0.5, 0., 0. ] ],
-                    [ [ 0., 1., 0. ] ],
-                    ],
-                },
-        'Constraints': {
-                'Bd2DPi_lambda': 0.3 * 0.015,
-                'Bd2DPi_avgSSbar': [ '0.5*(@0+@1)', ['Bd2DPi_S', 'Bd2DPi_Sbar'], +0.046, 0.023 ],
-                'Bd2DPi_difSSbar': [ '0.5*(@0-@1)', ['Bd2DPi_S', 'Bd2DPi_Sbar'], -0.022, 0.021 ],
-		'Bd_AsymProd': 0.01,
-		'Bs_AsymProd': 0.01,
-		'Lb_AsymProd': 0.03,
-		'CombBkg_AsymProd': 	0.03,
-		'Bs2DsK_AsymDet':	0.005,
-		'Bd2DK_AsymDet':	0.01,
-		'Bd2DPi_AsymDet':	0.01,
-		'Bd2DsK_AsymDet':	0.01,
-		'Bs2DsPi_AsymDet':	0.01,
-		'Lb2LcK_AsymDet':	0.03,
-		'Lb2LcPi_AsymDet':	0.03,
-		'CombBkg_AsymDet':	0.01,
-		'Lb2Dsp_AsymDet':	0.03,
-		'Lb2Dsstp_AsymDet':	0.03,
-		'Bs2DsstPi_AsymDet':	0.01,
-		'Bs2DsRho_AsymDet':	0.01,
-                },
-        'Asymmetries': {
-                'Prod': {
-		    'Bs': -0.0175698,
-		    'Bd': 0.00943518,
-		    'Lb': 0.0301775,
-		    'CombBkg': -0.01,
-		    },
-		'Det': {
-		    'Bs2DsK': 0.0100562,
-		    'Bd2DK': 0.0100174,
-		    'Bd2DPi': 0.00502173,
-		    'Bd2DsK': 0.0100562,
-		    'Bs2DsPi': 0.00608738,
-		    'Lb2LcK': 0.00990014,
-		    'Lb2LcPi': 0.00515764,
-		    'CombBkg': 0.00987629,
-		    'Lb2Dsp': 0.0199224,
-		    'Lb2Dsstp': 0.0198115,
-		    'Bs2DsstPi': 0.00491299,
-		    'Bs2DsRho': 0.00488479,
-		    },
-                'TagEff': {},
-                'TagEff_t': {}, 'TagEff_f': {},
-                },
-        'DecayTimeResolutionModel':	'GaussianWithPEDTE',
-        'DecayTimeResolutionScaleFactor': 1.37,
-        'DecayTimeErrorTemplates': {
-                'Bs2DsK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsK',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bs2DsPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bs2DsRho': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsRho',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bs2DsstPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsstPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Lb2Dsp': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Lb2Dsp',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Lb2Dsstp': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Lb2Dsstp',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Lb2LcK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Lb2LcK',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Lb2LcPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Lb2LcPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bd2DK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bd2DK',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bd2DPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bd2DPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'CombBkg': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_CombBkg',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                },
-        'KFactorTemplates': {
-                'Bs2DsPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bs2DsPi_both',
-                    'VarName': 'kfactorVar', },
-                'Bs2DsstPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bs2DsstPi_both',
-                    'VarName': 'kfactorVar', },
-                'Bs2DsRho': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bs2DsRho_both',
-                    'VarName': 'kfactorVar', },
-                'Lb2LcK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Lb2LcK_both',
-                    'VarName': 'kfactorVar', },
-                'Lb2LcPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Lb2LcPi_both',
-                    'VarName': 'kfactorVar', },
-                'Lb2Dsp': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Lb2Dsp_both',
-                    'VarName': 'kfactorVar', },
-                'Lb2Dsstp': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Lb2Dsstp_both',
-                    'VarName': 'kfactorVar', },
-                'Bd2DK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bd2DK_both',
-                    'VarName': 'kfactorVar', },
-                'Bd2DPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bd2DPi_both',
-                    'VarName': 'kfactorVar', },
-                },
-        'AcceptanceFunction': 'Spline',
-	'AcceptanceSplineKnots': [0.5, 1.0, 1.5, 2.0, 3.0, 12.0],
-	'AcceptanceSplineCoeffs':   { # dspi data dsk mc dspi mc
-	    'MC': {
-		'Bs2DsPi':      [ 0.459, 0.690, 0.885, 1.130, 1.223, 1.228 ],
-		'Bs2DsK':       [0.4453873694523979, 0.6869245867352556, 0.8719680916278891, 1.1614426699209424, 1.2341250036543179, 1.2852701638596233],
-		},
-	    },
-    'constParams': [
-            'Gammas', 'deltaGammas', 'deltaMs',
-            'Gammad', 'deltaGammad', 'deltaMd',
-            'mistag', 'timeerr_bias', 'timeerr_scalefactor',
-            '.+_Mistag[0-9]+Calib(B|Bbar)_p[0-9]+',
-            'Bs2DsKst_TagEff[0-9]', 'Bs2DsKst_delta', 'Bs2DsKst_lambda', 'Bs2DsKst_phi_w',
-	    '.+Asym.+',
-            ],
-}
diff --git a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsK-Agn140-sFit.py b/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsK-Agn140-sFit.py
deleted file mode 100644
index a752737fbbc218018c06dd209ed9011aa66c69c2..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsK-Agn140-sFit.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# personality for 2011 Paper - mode DsK
-{
-        'Modes': [
-            'Bs2DsK',
-            'Bs2DsKst',
-            'Bs2DsPi', 'Bs2DsstPi', 'Bs2DsRho',
-            'Bd2DK', 'Bd2DPi', 'Bd2DsK',
-            'Lb2LcK', 'Lb2LcPi', 'Lb2Dsp', 'Lb2Dsstp',
-            'CombBkg'
-            ],
-        'SampleCategories': [
-            'nonres', 'phipi', 'kstk', 'kpipi', 'pipipi'
-            ],
-        'DeltaMs':                      17.768, # in ps^{-1}
-        'GammaLb':			0.700, # in ps^{-1}
-        'GammaCombBkg':			0.971, # in ps^{-1}
-        'WeakPhase': {
-            'Bs2DsK':           140. / 180. * pi,
-            'Bs2DsstK':         70. / 180. * pi,
-            'Bs2DsKst':         70. / 180. * pi,
-            'Bs2DsstKst':	70. / 180. * pi,
-            'Bd2DPi':           70. / 180. * pi
-            },
-        'StrongPhase': {
-            'Bs2DsK':           30. / 180. * pi,
-            'Bs2DsstK':         -150. / 180. * pi,
-            'Bs2DsKst':         -150. / 180. * pi,
-            'Bs2DsstKst':       30. / 180. * pi,
-            'Bd2DPi':           30. / 180. * pi
-            },
-        'AcceptanceCorrectionFile': None,
-        'CombineModesForEffCPObs': [ ],
-        'NEvents':			[ 3474. ],
-        'DataFileName': '/afs/cern.ch/work/a/adudziak/public/Bs2DsKToys/Gamma140_5M/DsK_Toys_sWeights_ForTimeFit_%d.root' % TOY_NUMBER,
-        'DataSetNames': 'merged',
-        'FitMode': 'sFit',
-        'DataWorkSpaceName':    'FitMeToolWS',
-	'DataSetVarNameMapping': {
-	    'sample':   'sample',
-	    'mass':     'lab0_MassFitConsD_M',
-	    'pidk':     'lab1_PIDK',
-            'dsmass':   'lab2_MM',
-            'time':     'lab0_LifetimeFit_ctau',
-            'timeerr':  'lab0_LifetimeFit_ctauErr',
-            'mistag':   'lab0_BsTaggingTool_TAGOMEGA_OS',
-            'qf':       'lab1_ID_idx',
-            'qt':       'lab0_BsTaggingTool_TAGDECISION_OS_idx',
-            'weight':   'nSig_both_nonres_Evts_sw+nSig_both_phipi_Evts_sw+nSig_both_kstk_Evts_sw+nSig_both_kpipi_Evts_sw+nSig_both_pipipi_Evts_sw'
-            },
-        'MassTemplateFile':             ('/afs/cern.ch/work/a/adudziak/public/Bs2DsKToys/Gamma140_5M/DsK_Toys_Work_ForMassPlot_%d.root' if haveAFS else
-            os.environ['B2DXFITTERSROOT']+'/scripts/mdfit-004/data/DsK_Toys_Work_ForMassPlot_%d.root') % TOY_NUMBER,
-        'MassTemplateWorkspace':	'FitMeToolWS',
-        'MassInterpolation':		False,
-        'MistagTemplateFile':           os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/templates_BsDsPi.root',
-        'MistagTemplateWorkspace':	'workspace',
-        'MistagTemplateName':	        'MistagPdf_signal_BDTGA',
-        'DecayTimeResolutionModel':	'GaussianWithPEDTE',
-        'DecayTimeResolutionScaleFactor': 1.37,
-        'DecayTimeErrorTemplateFile':   os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/templates_BsDsK.root',
-        'DecayTimeErrorTemplateWorkspace':  'workspace',
-        'DecayTimeErrorTemplateName':   'TimeErrorPdf_signal_BDTGA',
-        'DecayTimeErrorVarName':        'lab0_LifetimeFit_ctauErr',
-        'PowLawAcceptance_turnon':	1.3291e+00,
-        'PowLawAcceptance_offset':	1.6710e-02,
-        'PowLawAcceptance_expo':	1.8627e+00,
-        'PowLawAcceptance_beta':	3.4938e-02,
-        'NBinsAcceptance':              600,
-        'constParams': [
-            'Gammas', 'deltaGammas', 'deltaMs',
-            'Gammad', 'deltaGammad', 'deltaMd',
-            'mistag', 'timeerr_bias', 'timeerr_scalefactor',
-            'MistagCalibB_p0', 'MistagCalibB_p1', 'MistagCalibB_avgmistag',
-            'MistagCalibBbar_p0', 'MistagCalibBbar_p1', 'MistagCalibBbar_avgmistag',
-            'Bs2DsKst_TagEff', 'Bs2DsKst_delta', 'Bs2DsKst_lambda', 'Bs2DsKst_phi_w',
-            ],
-        'Constraints': {
-                'Bd2DPi_lambda': 0.3 * 0.0187,
-                'Bd2DPi_avgSSbar': [ '0.5*(@0+@1)', ['Bd2DPi_S', 'Bd2DPi_Sbar'], +0.046, 0.023 ],
-                'Bd2DPi_difSSbar': [ '0.5*(@0-@1)', ['Bd2DPi_S', 'Bd2DPi_Sbar'], -0.022, 0.021 ],
-                },
-}
diff --git a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsK-Agn140.py b/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsK-Agn140.py
deleted file mode 100644
index 367312549fade0f344f55de701efbbf6aedf9fa0..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsK-Agn140.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# personality for 2011 Paper - mode DsK
-{
-        'Modes': [
-            'Bs2DsK',
-            'Bs2DsKst',
-            'Bs2DsPi', 'Bs2DsstPi', 'Bs2DsRho',
-            'Bd2DK', 'Bd2DPi', 'Bd2DsK',
-            'Lb2LcK', 'Lb2LcPi', 'Lb2Dsp', 'Lb2Dsstp',
-            'CombBkg'
-            ],
-        'SampleCategories': [
-            'nonres', 'phipi', 'kstk', 'kpipi', 'pipipi'
-            ],
-        'DeltaMs':                      17.768, # in ps^{-1}
-        'GammaLb':			0.700, # in ps^{-1}
-        'GammaCombBkg':			0.971, # in ps^{-1}
-        'WeakPhase': {
-            'Bs2DsK':           140. / 180. * pi,
-            'Bs2DsstK':         70. / 180. * pi,
-            'Bs2DsKst':         70. / 180. * pi,
-            'Bs2DsstKst':	70. / 180. * pi,
-            'Bd2DPi':           70. / 180. * pi
-            },
-        'StrongPhase': {
-            'Bs2DsK':           30. / 180. * pi,
-            'Bs2DsstK':         -150. / 180. * pi,
-            'Bs2DsKst':         -150. / 180. * pi,
-            'Bs2DsstKst':       30. / 180. * pi,
-            'Bd2DPi':           30. / 180. * pi
-            },
-        'AcceptanceCorrectionFile': None,
-        'CombineModesForEffCPObs': [ ],
-        'NEvents':			[ 3474. ],
-        'DataFileName':         ('/afs/cern.ch/work/a/adudziak/public/Bs2DsKToys/Gamma140_5M/DsK_Toys_Work_ForMassPlot_%d.root' if haveAFS else
-            os.environ['B2DXFITTERSROOT']+'/scripts/mdfit-004/data/DsK_Toys_Work_ForMassPlot_%d.root') % TOY_NUMBER,
-        'DataWorkSpaceName':    'FitMeToolWS',
-        'DataSetNames':         'combData',
-	'DataSetVarNameMapping': {
-	    'sample':   'sample',
-	    'mass':     'lab0_MassFitConsD_M',
-	    'pidk':     'lab1_PIDK',
-            'dsmass':   'lab2_MM',
-            'time':     'lab0_LifetimeFit_ctau',
-            'timeerr':  'lab0_LifetimeFit_ctauErr',
-            'mistag':   'lab0_BsTaggingTool_TAGOMEGA_OS',
-            'qf':       'lab1_ID_idx',
-            'qt':       'lab0_BsTaggingTool_TAGDECISION_OS_idx',
-            'weight':   'nSig_both_nonres_Evts_sw+nSig_both_phipi_Evts_sw+nSig_both_kstk_Evts_sw+nSig_both_kpipi_Evts_sw+nSig_both_pipipi_Evts_sw'
-            },
-        'MassTemplateFile':             ('/afs/cern.ch/work/a/adudziak/public/Bs2DsKToys/Gamma140_5M/DsK_Toys_Work_ForMassPlot_%d.root' if haveAFS else
-            os.environ['B2DXFITTERSROOT']+'/scripts/mdfit-004/data/DsK_Toys_Work_ForMassPlot_%d.root') % TOY_NUMBER,
-        'MassTemplateWorkspace':	'FitMeToolWS',
-        'MassInterpolation':		False,
-        'MistagTemplateFile':           os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/templates_BsDsPi.root',
-        'MistagTemplateWorkspace':	'workspace',
-        'MistagTemplateName':	        'MistagPdf_signal_BDTGA',
-        'DecayTimeResolutionModel':	'GaussianWithPEDTE',
-        'DecayTimeResolutionScaleFactor': 1.37,
-        'DecayTimeErrorTemplateFile':   os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/templates_BsDsK.root',
-        'DecayTimeErrorTemplateWorkspace':  'workspace',
-        'DecayTimeErrorTemplateName':   'TimeErrorPdf_signal_BDTGA',
-        'DecayTimeErrorVarName':        'lab0_LifetimeFit_ctauErr',
-        'PowLawAcceptance_turnon':	1.3291e+00,
-        'PowLawAcceptance_offset':	1.6710e-02,
-        'PowLawAcceptance_expo':	1.8627e+00,
-        'PowLawAcceptance_beta':	3.4938e-02,
-        'NBinsAcceptance':              600,
-        'constParams': [
-            'Gammas', 'deltaGammas', 'deltaMs',
-            'Gammad', 'deltaGammad', 'deltaMd',
-            'mistag', 'timeerr_bias', 'timeerr_scalefactor',
-            'MistagCalibB_p0', 'MistagCalibB_p1', 'MistagCalibB_avgmistag',
-            'MistagCalibBbar_p0', 'MistagCalibBbar_p1', 'MistagCalibBbar_avgmistag',
-            'Bs2DsKst_TagEff', 'Bs2DsKst_delta', 'Bs2DsKst_lambda', 'Bs2DsKst_phi_w',
-            ],
-        'Constraints': {
-                'Bd2DPi_lambda': 0.3 * 0.0187,
-                'Bd2DPi_avgSSbar': [ '0.5*(@0+@1)', ['Bd2DPi_S', 'Bd2DPi_Sbar'], +0.046, 0.023 ],
-                'Bd2DPi_difSSbar': [ '0.5*(@0-@1)', ['Bd2DPi_S', 'Bd2DPi_Sbar'], -0.022, 0.021 ],
-                },
-}
diff --git a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsK-Agn70-sFit.py b/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsK-Agn70-sFit.py
deleted file mode 100644
index be3a1cda9c86c41336698313d1ce9b8d57b88c64..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsK-Agn70-sFit.py
+++ /dev/null
@@ -1,219 +0,0 @@
-# personality for 2011 Paper - mode DsK
-{
-        'Modes': [
-            'Bs2DsK',
-            'Bs2DsKst',
-            'Bs2DsPi', 'Bs2DsstPi', 'Bs2DsRho',
-            'Bd2DK', 'Bd2DPi', 'Bd2DsK',
-            'Lb2LcK', 'Lb2LcPi', 'Lb2Dsp', 'Lb2Dsstp',
-            'CombBkg'
-            ],
-        'SampleCategories': [
-            'nonres', 'phipi', 'kstk', 'kpipi', 'pipipi'
-            ],
-        'DeltaMs':                      17.768, # in ps^{-1}
-        'GammaLb':			0.700, # in ps^{-1}
-        'GammaCombBkg':			0.971, # in ps^{-1}
-        'WeakPhase': {
-            'Bs2DsK':           70. / 180. * pi,
-            'Bs2DsstK':         70. / 180. * pi,
-            'Bs2DsKst':         70. / 180. * pi,
-            'Bs2DsstKst':	70. / 180. * pi,
-            'Bd2DPi':           70. / 180. * pi
-            },
-        'StrongPhase': {
-            'Bs2DsK':           30. / 180. * pi,
-            'Bs2DsstK':         -150. / 180. * pi,
-            'Bs2DsKst':         -150. / 180. * pi,
-            'Bs2DsstKst':       30. / 180. * pi,
-            'Bd2DPi':           30. / 180. * pi
-            },
-        'AcceptanceCorrectionFile': None,
-        'CombineModesForEffCPObs': [ ],
-        'NEvents':			[ 3474. ],
-        'DataFileName': ('/afs/cern.ch/work/a/adudziak/public/Bs2DsKToys/Gamma70_5M_2T/DsK_Toys_sWeights_ForTimeFit_%d.root' if haveAFS else
-		os.environ['B2DXFITTERSROOT']+'/scripts/paper-dsk-agn70-nominal/sfit/DsK_Toys_sWeights_ForTimeFit_%d.root')% TOY_NUMBER,
-        'FitMode': 'sFit',
-        'DataWorkSpaceName':    'FitMeToolWS',
-        'DataSetNames': 'merged',
-	'DataSetVarNameMapping': {
-	    'sample':   'sample',
-	    'mass':     'lab0_MassFitConsD_M',
-	    'pidk':     'lab1_PIDK',
-            'dsmass':   'lab2_MM',
-            'time':     'lab0_LifetimeFit_ctau',
-            'timeerr':  'lab0_LifetimeFit_ctauErr',
-            'mistag':   'tagOmegaComb',
-            'qf':       'lab1_ID',
-            'qt':       'tagDecComb',
-            'weight':   'nSig_both_nonres_Evts_sw+nSig_both_phipi_Evts_sw+nSig_both_kstk_Evts_sw+nSig_both_kpipi_Evts_sw+nSig_both_pipipi_Evts_sw'
-            },
-        'MassTemplateFile':             ('/afs/cern.ch/work/a/adudziak/public/Bs2DsKToys/Gamma70_5M_2T/DsK_Toys_Work_ForMassPlot_%d.root' if haveAFS else
-            os.environ['B2DXFITTERSROOT']+'/scripts/paper-dsk-agn70-nominal/data/DsK_Toys_Work_ForMassPlot_%d.root') % TOY_NUMBER,
-        'MassTemplateWorkspace':	'FitMeToolWS',
-        'MassInterpolation':		False,
-        'NTaggers':                     3,
-        'TagEff':                    {
-            'Bs2DsK': [ 0.3870 * (1. - 0.4772), 0.4772 * (1. - 0.3870), 0.3870 * 0.4772 ],
-            'Lb': [ 0.3870, 0.4772 ],
-            'Bd': [ 0.3870, 0.4772 ],
-            },
-        'MistagTemplates': {
-            'Bs2DsK': [
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_3',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            'Bd2DPi': [
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BDPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BDPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BDPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_3',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            'CombBkg': [
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_3',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            },
-        'MistagCalibrationParams': {
-                'Bs2DsK': [
-                    [ [ 0., 1., 0. ] ],
-                    [ [ 0., 1., 0. ] ],
-                    [ [ 0., 1., 0. ] ],
-                    ],
-                'Bd': [
-                    [ [ 0., 1., 0. ] ],
-                    [ [ 0.5, 0., 0. ] ],
-                    [ [ 0., 1., 0. ] ],
-                    ],
-                },
-        'Asymmetries': {
-                'Prod': {}, 'Det': { }, 'TagEff': {}, 'TagEff_t': {}, 'TagEff_f': {},
-                },
-        'DecayTimeResolutionModel':	'GaussianWithPEDTE',
-        'DecayTimeResolutionScaleFactor': 1.37,
-        'DecayTimeErrorTemplates': {
-                'Bs2DsK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsK',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bs2DsPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bs2DsRho': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsRho',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bs2DsstPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsstPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Lb2Dsp': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Lb2Dsp',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Lb2Dsstp': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Lb2Dsstp',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Lb2LcK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Lb2LcK',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bd2DK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bd2DK',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'CombBkg': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_CombBkg',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                },
-        'KFactorTemplates': {
-                'Bs2DsPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5300_5800.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bs2DsPi_both',
-                    'VarName': 'kfactorVar', },
-                'Bs2DsstPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5300_5800.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bs2DsstPi_both',
-                    'VarName': 'kfactorVar', },
-                'Bs2DsRho': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5300_5800.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bs2DsRho_both',
-                    'VarName': 'kfactorVar', },
-                'Lb2LcK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5300_5800.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Lb2LcK_both',
-                    'VarName': 'kfactorVar', },
-                'Lb2Dsp': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5300_5800.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Lb2Dsp_both',
-                    'VarName': 'kfactorVar', },
-                'Lb2Dsstp': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5300_5800.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Lb2Dsstp_both',
-                    'VarName': 'kfactorVar', },
-                'Bd2DK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5300_5800.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bd2DK_both',
-                    'VarName': 'kfactorVar', },
-                },
-        'AcceptanceFunction': 'Spline',
-        'constParams': [
-            'Gammas', 'deltaGammas', 'deltaMs',
-            'Gammad', 'deltaGammad', 'deltaMd',
-            'mistag', 'timeerr_bias', 'timeerr_scalefactor',
-            '.+_Mistag[0-9]+Calib(B|Bbar)_p[0-9]+',
-            'Bs2DsKst_TagEff[0-9]', 'Bs2DsKst_delta', 'Bs2DsKst_lambda', 'Bs2DsKst_phi_w',
-            ],
-        'Constraints': {
-                'Bd2DPi_lambda': 0.3 * 0.0187,
-                'Bd2DPi_avgSSbar': [ '0.5*(@0+@1)', ['Bd2DPi_S', 'Bd2DPi_Sbar'], +0.046, 0.023 ],
-                'Bd2DPi_difSSbar': [ '0.5*(@0-@1)', ['Bd2DPi_S', 'Bd2DPi_Sbar'], -0.022, 0.021 ],
-                },
-}
diff --git a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsK-Agn70.py b/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsK-Agn70.py
deleted file mode 100644
index 1d27da8cda97eb04881408117a7400b1973780bd..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsK-Agn70.py
+++ /dev/null
@@ -1,252 +0,0 @@
-# personality for 2011 Paper - mode DsK
-{
-	'UseKFactor': False,
-        'Modes': [
-            'Bs2DsK',
-            'Bs2DsKst',
-            'Bs2DsPi', 'Bs2DsstPi', 'Bs2DsRho',
-            'Bd2DK', 'Bd2DPi', 'Bd2DsK',
-            'Lb2LcK', 'Lb2LcPi', 'Lb2Dsp', 'Lb2Dsstp',
-            'CombBkg'
-            ],
-        'SampleCategories': [
-            'nonres', 'phipi', 'kstk', 'kpipi', 'pipipi'
-            ],
-	'DGsOverGs':                    -0.105/0.661, # DeltaGammas / Gammas
-        'DeltaMs':                      17.768, # in ps^{-1}
-        'GammaLb':			0.700, # in ps^{-1}
-        'GammaCombBkg':			0.800, # in ps^{-1}
-        'WeakPhase': {
-            'Bs2DsK':           70. / 180. * pi,
-            'Bs2DsstK':         70. / 180. * pi,
-            'Bs2DsKst':         70. / 180. * pi,
-            'Bs2DsstKst':	70. / 180. * pi,
-            'Bd2DPi':           70. / 180. * pi
-            },
-        'StrongPhase': {
-            'Bs2DsK':           30. / 180. * pi,
-            'Bs2DsstK':         -150. / 180. * pi,
-            'Bs2DsKst':         -150. / 180. * pi,
-            'Bs2DsstKst':       30. / 180. * pi,
-            'Bd2DPi':           20. / 180. * pi
-            },
-        'ModLf': {
-	    'Bs2DsK': 	0.372,
-	    'Bs2DsstK': 	0.372,
-	    'Bs2DsKst': 	0.372,
-	    'Bs2DsstKst': 	0.372,
-	    'Bd2DPi':       0.015
-	    },
-        'AcceptanceCorrectionFile': None,
-        'CombineModesForEffCPObs': [ ],
-        'NEvents':			[ 3474. ],
-        'DataFileName':         ('/afs/cern.ch/work/g/gligorov/public/Bs2DsKToys/For1fbPaper/Gamma70_WProdDetAsy_NoKFactors_5M_2T_MD/MassFitResults/Nominal/DsK_Toys_Work_ForMassPlot_%d.root' if haveAFS else
-            os.environ['B2DXFITTERSROOT']+'/scripts/paper-dsk-agn70-nominal/data-nok/DsK_Toys_Work_ForMassPlot_%d.root') % TOY_NUMBER,
-        'DataWorkSpaceName':    'FitMeToolWS',
-        'DataSetNames':         'combData',
-	'DataSetVarNameMapping': {
-	    'sample':   'sample',
-	    'mass':     'lab0_MassFitConsD_M',
-	    'pidk':     'lab1_PIDK',
-            'dsmass':   'lab2_MM',
-            'time':     'lab0_LifetimeFit_ctau',
-            'timeerr':  'lab0_LifetimeFit_ctauErr',
-            'mistag':   'tagOmegaComb',
-            'qf':       'lab1_ID',
-            'qt':       'tagDecComb',
-            'weight':   'nSig_both_nonres_Evts_sw+nSig_both_phipi_Evts_sw+nSig_both_kstk_Evts_sw+nSig_both_kpipi_Evts_sw+nSig_both_pipipi_Evts_sw'
-            },
-        'FitRanges': {
-		'time':     [0.4, 15.],
-		'timeerr':  [1e-6, 0.25],
-		'mistag':   [0., 0.5],
-		'mass':     [5320., 5420.],
-		'dsmass':   [1930., 2015.],
-		'pidk':     [0., 150.]
-		},
-        'MassTemplateFile':             ('/afs/cern.ch/work/g/gligorov/public/Bs2DsKToys/For1fbPaper/Gamma70_WProdDetAsy_NoKFactors_5M_2T_MD/MassFitResults/Nominal/DsK_Toys_Work_ForMassPlot_%d.root' if haveAFS else
-            os.environ['B2DXFITTERSROOT']+'/scripts/paper-dsk-agn70-nominal/data-nok/DsK_Toys_Work_ForMassPlot_%d.root') % TOY_NUMBER,
-        'MassTemplateWorkspace':	'FitMeToolWS',
-        'MassInterpolation':		False,
-        'NTaggers':                     3,
-        'TagEff':                    {
-            'Bs2DsK': [ 0.3870 * (1. - 0.4772), 0.4772 * (1. - 0.3870), 0.3870 * 0.4772 ],
-            'Lb': [ 0.3870, 0.4772 ],
-            'Bd': [ 0.3870, 0.4772 ],
-            },
-        'MistagTemplates': {
-            'Bs2DsK': [
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_3',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            'Bd2DPi': [
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BDPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BDPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BDPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            'CombBkg': [
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_3',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            },
-        'MistagCalibrationParams': {
-                'Bs2DsK': [
-                    [ [ 0., 1., 0. ] ],
-                    [ [ 0., 1., 0. ] ],
-                    [ [ 0., 1., 0. ] ],
-                    ],
-                'Bd': [
-                    [ [ 0., 1., 0. ] ],
-                    [ [ 0.5, 0., 0. ] ],
-                    [ [ 0., 1., 0. ] ],
-                    ],
-                },
-        'Constraints': {
-                'Bd2DPi_lambda': 0.3 * 0.015,
-                'Bd2DPi_avgSSbar': [ '0.5*(@0+@1)', ['Bd2DPi_S', 'Bd2DPi_Sbar'], +0.046, 0.023 ],
-                'Bd2DPi_difSSbar': [ '0.5*(@0-@1)', ['Bd2DPi_S', 'Bd2DPi_Sbar'], -0.022, 0.021 ],
-		'Bd_AsymProd': 0.01,
-		'Bs_AsymProd': 0.01,
-		'Lb_AsymProd': 0.03,
-		'Bd2DK_AsymDet':	0.01,
-		'Bd2DPi_AsymDet':	0.01,
-		'Bd2DsK_AsymDet':	0.01,
-		'Bs2DsPi_AsymDet':	0.01,
-		'Lb2LcK_AsymDet':	0.03,
-		'Lb2LcPi_AsymDet':	0.03,
-		'CombBkg_AsymDet':	0.01,
-		'Lb2Dsp_AsymDet':	0.03,
-		'Lb2Dsstp_AsymDet':	0.03,
-		'Bs2DsstPi_AsymDet':	0.01,
-		'Bs2DsRho_AsymDet':	0.01,
-                },
-        'Asymmetries': {
-                'Prod': {
-		    'Bs': -0.014,
-		    'Bd': 0.011,
-		    'Lb': 0.03,
-		    },
-		'Det': {
-		        'Bs2DsK':	0.01,
-			'Bd2DK':	0.01,
-			'Bd2DPi':	0.005,
-			'Bd2DsK':	0.01,
-			'Bs2DsPi':	0.005,
-			'Lb2LcK':	0.01,
-			'Lb2LcPi':	0.005,
-			'CombBkg':	0.01,
-			'Lb2Dsp':	0.02,
-			'Lb2Dsstp':	0.02,
-			'Bs2DsstPi':	0.005,
-			'Bs2DsRho':	0.005,
-		    },
-		'TagEff': {}, 'TagEff_t': {}, 'TagEff_f': {},
-                },
-        'DecayTimeResolutionModel':	'GaussianWithPEDTE',
-        'DecayTimeResolutionScaleFactor': 1.37,
-        'DecayTimeErrorTemplates': {
-                'Bs2DsK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsK',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bs2DsPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bs2DsRho': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsRho',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bs2DsstPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsstPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Lb2Dsp': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Lb2Dsp',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Lb2Dsstp': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Lb2Dsstp',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Lb2LcK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Lb2LcK',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Lb2LcPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Lb2LcPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bd2DK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bd2DK',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bd2DPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bd2DPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'CombBkg': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_CombBkg',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                },
-        'AcceptanceFunction': 'Spline',
-	'AcceptanceSplineCoeffs':   { # dspi data dsk mc dspi mc
-	    'MC': {
-		'Bs2DsPi':      [ 0.179, 0.294, 0.690, 1.125, 1.245, 1.270 ],
-		'Bs2DsK':       [ 1.77520e-01, 2.89603e-01, 6.79455e-01, 1.11726e+00, 1.23189e+00, 1.26661e+00 ],
-		},
-	    'DATA': {
-		'Bs2DsPi':      [ 0.145, 0.210, 0.625, 1.029, 1.258, 1.241 ],
-		'Bs2DsK':       [ 0.128, 0.193, 0.590, 1.023, 1.250, 1.253 ],
-		}
-	    },
-    'constParams': [
-            'Gammas', 'deltaGammas', 'deltaMs',
-            'Gammad', 'deltaGammad', 'deltaMd',
-            'mistag', 'timeerr_bias', 'timeerr_scalefactor',
-            '.+_Mistag[0-9]+Calib(B|Bbar)_p[0-9]+',
-            'Bs2DsKst_TagEff[0-9]', 'Bs2DsKst_delta', 'Bs2DsKst_lambda', 'Bs2DsKst_phi_w',
-	    '.+Asym.+',
-            ],
-}
diff --git a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsK-MC.py b/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsK-MC.py
deleted file mode 100644
index 7b3ee9ad8184e029c21bbc232ed126d3560a066a..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsK-MC.py
+++ /dev/null
@@ -1,182 +0,0 @@
-# personality for 2011 Paper - mode DsK - mixed from official MC (Gauss/Boole/...)
-{
-        'Modes': [
-            'Bs2DsK',
-            'Bs2DsPi',
-            'CombBkg'
-            ],
-        #'FitMode': 'sFit',
-        #'FitRanges': {
-        #    'time':     [0.2, 15.],
-        #    'timeerr':  [1e-6, 0.25],
-        #    'mistag':   [0., 0.5],
-        #    'mass':     [5300., 5800.],
-        #    'dsmass':   [1930., 2015.],
-        #    'pidk':     [0., 150.]
-        #    },
-        'SampleCategories': [
-            'nonres', 'phipi', 'kstk', 'kpipi', 'pipipi'
-            ],
-        'Gammas':                       0.679,
-	'DGsOverGs':                    -0.060/0.679, # DeltaGammas / Gammas
-        'DeltaMs':                      17.800, # in ps^{-1}
-        'GammaLb':			0.700, # in ps^{-1}
-        'GammaCombBkg':			0.800, # in ps^{-1}
-        'WeakPhase': {
-            'Bs2DsK':           70. / 180. * pi,
-            },
-        'StrongPhase': {
-            'Bs2DsK':           30. / 180. * pi,
-            },
-        'ModLf': {
-	    'Bs2DsK': 	        0.0,
-	    },
-        'AcceptanceCorrectionFile': None,
-        'CombineModesForEffCPObs': [ ],
-        'NEvents':			[ 3474. ],
-        #'DataFileName':         '/afs/cern.ch/work/a/adudziak/public/workspace/DsKReview/FullMCDsK/sWeights_BsDsK_all_both_FullMC.root',
-        #'DataFileName':         '/afs/cern.ch/work/a/adudziak/public/workspace/DsKReview/FullMCDsK/sWeights_BsDsK_all_both_FullMC_DsKCombo.root',
-        #'DataFileName':         '/afs/cern.ch/work/a/adudziak/public/workspace/DsKReview/FullMCDsK/sWeights_BsDsK_all_both_FullMC_DsKDsPi.root',
-        #'DataFileName':         '/afs/cern.ch/work/a/adudziak/public/workspace/DsKReview/FullMCDsK/sWeights_BsDsK_all_both_FullMC_Signal.root',
-        'DataFileName':         '/afs/cern.ch/work/a/adudziak/public/workspace/DsKReview/FullMCDsK/WS_Mass_DsK_5M_FullMC2.root',
-        #'DataFileName':         '/afs/cern.ch/work/a/adudziak/public/workspace/DsKReview/FullMCDsK/WS_Mass_DsK_5M_FullMC_DsKCombo2.root',
-        #'DataFileName':         '/afs/cern.ch/work/a/adudziak/public/workspace/DsKReview/FullMCDsK/WS_Mass_DsK_5M_FullMC_DsKDsPi.root',
-        #'DataFileName':         '/afs/cern.ch/work/a/adudziak/public/workspace/DsKReview/FullMCDsK/WS_Mass_DsK_5M_FullMC_Signal.root',
-        'DataWorkSpaceName':    'FitMeToolWS',
-        #'DataSetNames':         'merged',
-        'DataSetNames':         'combData',
-	'DataSetVarNameMapping': {
-	    'sample':   'sample',
-	    'mass':     'lab0_MassFitConsD_M',
-	    'pidk':     'lab1_PIDK',
-            'dsmass':   'lab2_MM',
-            'time':     'lab0_LifetimeFit_ctau',
-            'timeerr':  'lab0_LifetimeFit_ctauErr',
-            'mistag':   'tagOmegaComb',
-            'qf':       'lab1_ID',
-            'qt':       'tagDecComb',
-            'weight':   'nSig_both_nonres_Evts_sw+nSig_both_phipi_Evts_sw+nSig_both_kstk_Evts_sw+nSig_both_kpipi_Evts_sw+nSig_both_pipipi_Evts_sw'
-            },
-        'MassTemplateFile':             '/afs/cern.ch/work/a/adudziak/public/workspace/DsKReview/FullMCDsK/WS_Mass_DsK_5M_FullMC2.root',
-        #'MassTemplateFile':             '/afs/cern.ch/work/a/adudziak/public/workspace/DsKReview/FullMCDsK/WS_Mass_DsK_5M_FullMC_DsKCombo2.root',
-        #'MassTemplateFile':             '/afs/cern.ch/work/a/adudziak/public/workspace/DsKReview/FullMCDsK/WS_Mass_DsK_5M_FullMC_DsKDsPi.root',
-        #'MassTemplateFile':             '/afs/cern.ch/work/a/adudziak/public/workspace/DsKReview/FullMCDsK/WS_Mass_DsK_5M_FullMC_Signal.root',
-        'MassTemplateWorkspace':	'FitMeToolWS',
-        'MassInterpolation':		False,
-        'NTaggers':                     3,
-        'TagEff':                    {
-            'Bs2DsK': [ 0.3979 * (1. - 0.6137), 0.6137 * (1. - 0.3979), 0.3979 * 0.6137 ],
-            },
-        'MistagTemplates': {
-            'Bs2DsK': [
-                {   'File': '/afs/cern.ch/work/a/adudziak/public/workspace/DsKReview/FullMCDsK/templates_mistag.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': '/afs/cern.ch/work/a/adudziak/public/workspace/DsKReview/FullMCDsK/templates_mistag.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': '/afs/cern.ch/work/a/adudziak/public/workspace/DsKReview/FullMCDsK/templates_mistag.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_3',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            'CombBkg': [
-                {   'File': '/afs/cern.ch/work/a/adudziak/public/workspace/DsKReview/FullMCDsK/templates_mistag.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': '/afs/cern.ch/work/a/adudziak/public/workspace/DsKReview/FullMCDsK/templates_mistag.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': '/afs/cern.ch/work/a/adudziak/public/workspace/DsKReview/FullMCDsK/templates_mistag.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_3',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            },
-        'MistagCalibrationParams': {
-                'Bs2DsK': [
-                    [ [ 0., 1., 0. ] ],
-                    [ [ 0., 1., 0. ] ],
-                    [ [ 0., 1., 0. ] ],
-                    ],
-                },
-        'Constraints': {
-		'Bs_AsymProd': 0.01,
-		'Bs2DsK_AsymDet':	0.01,
-		#'Bs2DsK_AsymTagEff0':	0.01,
-		#'Bs2DsK_AsymTagEff1':	0.01,
-		#'Bs2DsK_AsymTagEff2':	0.01,
-		'Bs2DsPi_AsymDet':	0.01,
-		'CombBkg_AsymDet':	0.01,
-                },
-        'Asymmetries': {
-                'Prod': {
-                    'Bs': 0.0,
-		    },
-		'Det': {
-		        'Bs2DsK':	0.0,
-			'Bs2DsPi':	0.0,
-			'CombBkg':	0.0,
-		    },
-		'TagEff': {
-                    },
-                'TagEff_t': {
-                    },
-                'TagEff_f': {
-                        },
-                },
-        'DecayTimeResolutionModel':	'GaussianWithPEDTE',
-        'DecayTimeResolutionScaleFactor': 1.195,
-        'DecayTimeErrorTemplates': {
-                'Bs2DsK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsK',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bs2DsPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'CombBkg': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_CombBkg',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                },
-        'KFactorTemplates': {
-                'Bs2DsPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bs2DsPi_both',
-                    'VarName': 'kfactorVar', },
-                },
-        'AcceptanceFunction': 'Spline',
-	'AcceptanceSplineCoeffs':   { # dspi data dsk mc dspi mc
-	    'MC': {
-		'Bs2DsPi':      [ 0.179, 0.294, 0.690, 1.125, 1.245, 1.270 ],
-                #'Bs2DsK':       [ 1.40502e-01, 2.52286e-01, 5.77488e-01, 1.07557e+00, 1.08338e+00, 1.29397e+00 ],
-                'Bs2DsK':       {
-                    'Bs2DsK': [ 1.40502e-01, 2.52286e-01, 5.77488e-01, 1.07557e+00, 1.08338e+00, 1.29397e+00 ],
-                    'Bs2DsPi': [ 0.181620, 0.164733, 0.511894, 0.80871, 0.98914, 1.14692 ],
-                    },
-		},
-	    'DATA': {
-		'Bs2DsPi':      [ 0.145, 0.210, 0.625, 1.029, 1.258, 1.241 ],
-		'Bs2DsK':       [ 0.128, 0.193, 0.590, 1.023, 1.250, 1.253 ],
-		}
-	    },
-        'constParams': [
-            'Gammas', 'deltaGammas', 'deltaMs',
-            'Gammad', 'deltaGammad', 'deltaMd',
-            'mistag', 'timeerr_bias', 'timeerr_scalefactor',
-            '.+_Mistag[0-9]+Calib(B|Bbar)_p[0-9]+',
-            'Bs2DsKst_TagEff[0-9]', 'Bs2DsKst_delta', 'Bs2DsKst_lambda', 'Bs2DsKst_phi_w',
-	    #'.+Asym.+',
-            #'.+TagEff.+',
-            ],
-}
diff --git a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsK.py b/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsK.py
deleted file mode 100644
index e1d9577602e19ddd4799e789e90e7a9073851b37..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsK.py
+++ /dev/null
@@ -1,254 +0,0 @@
-# personality for 2011 Paper - mode DsK
-{
-        'Modes': [
-            'Bs2DsK',
-            'Bs2DsKst',
-            'Bs2DsPi', 'Bs2DsstPi', 'Bs2DsRho',
-            'Bd2DK', 'Bd2DPi', 'Bd2DsK',
-            'Lb2LcK', 'Lb2LcPi', 'Lb2Dsp', 'Lb2Dsstp',
-            'CombBkg'
-            ],
-        'SampleCategories': [
-            'nonres', 'phipi', 'kstk', 'kpipi', 'pipipi'
-            ],
-        'DeltaMs':                      17.768, # in ps^{-1}
-        'GammaLb':			0.700, # in ps^{-1}
-        'GammaCombBkg':			0.971, # in ps^{-1}
-        'WeakPhase': {
-            'Bs2DsK':           70. / 180. * pi,
-            'Bs2DsstK':         70. / 180. * pi,
-            'Bs2DsKst':         70. / 180. * pi,
-            'Bs2DsstKst':	70. / 180. * pi,
-            'Bd2DPi':           70. / 180. * pi
-            },
-        'StrongPhase': {
-            'Bs2DsK':           30. / 180. * pi,
-            'Bs2DsstK':         -150. / 180. * pi,
-            'Bs2DsKst':         -150. / 180. * pi,
-            'Bs2DsstKst':       30. / 180. * pi,
-            'Bd2DPi':           30. / 180. * pi
-            },
-        'CombineModesForEffCPObs': [ ],
-        'NEvents':			[ 3474. ],
-        'MassTemplateFile':             os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/WS_Mass_DsK_5M_BDTGA.root',
-        'MassTemplateWorkspace':	'FitMeToolWS',
-        'MassInterpolation':		False,
-        'NTaggers':                     3,
-        'TagEff':                    {
-            'Bs2DsK': [ 0.3870 * (1. - 0.4772), 0.4772 * (1. - 0.3870), 0.3870 * 0.4772 ],
-            'Lb': [ 0.3870, 0.4772 ],
-            'Bd': [ 0.3870, 0.4772 ],
-            },
-        'MistagTemplates': {
-            'Bs2DsK': [
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_3',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            'Bd2DPi': [
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BDPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BDPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BDPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_3',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            'CombBkg': [
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_3',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            },
-        'MistagCalibrationParams': {
-                'Bs2DsK': [
-                    [ [ 0., 1., 0. ] ],
-                    [ [ 0., 1., 0. ] ],
-                    [ [ 0., 1., 0. ] ],
-                    ],
-                'Bd': [
-                    [ [ 0., 1., 0. ] ],
-                    [ [ 0.5, 0., 0. ] ],
-                    [ [ 0., 1., 0. ] ],
-                    ],
-                },
-        'Constraints': {
-                'Bd2DPi_lambda': 0.3 * 0.0187,
-                'Bd2DPi_avgSSbar': [ '0.5*(@0+@1)', ['Bd2DPi_S', 'Bd2DPi_Sbar'], +0.046, 0.023 ],
-                'Bd2DPi_difSSbar': [ '0.5*(@0-@1)', ['Bd2DPi_S', 'Bd2DPi_Sbar'], -0.022, 0.021 ],
-		'Bd_AsymProd': 0.01,
-		'Bs_AsymProd': 0.01,
-		'Lb_AsymProd': 0.03,
-		'Bd2DK_AsymDet':	0.01,
-		'Bd2DPi_AsymDet':	0.01,
-		'Bd2DsK_AsymDet':	0.01,
-		'Bs2DsPi_AsymDet':	0.01,
-		'Lb2LcK_AsymDet':	0.03,
-		'Lb2LcPi_AsymDet':	0.03,
-		'CombBkg_AsymDet':	0.01,
-		'Lb2Dsp_AsymDet':	0.03,
-		'Lb2Dsstp_AsymDet':	0.03,
-		'Bs2DsstPi_AsymDet':	0.01,
-		'Bs2DsRho_AsymDet':	0.01,
-                },
-        'Asymmetries': {
-                'Prod': {
-		    'Bs': -0.014,
-		    'Bd': 0.011,
-		    'Lb': 0.03,
-		    },
-		'Det': {
-		        'Bs2DsK':	0.01,
-			'Bd2DK':	0.01,
-			'Bd2DPi':	0.005,
-			'Bd2DsK':	0.01,
-			'Bs2DsPi':	0.005,
-			'Lb2LcK':	0.01,
-			'Lb2LcPi':	0.005,
-			'CombBkg':	0.01,
-			'Lb2Dsp':	0.02,
-			'Lb2Dsstp':	0.02,
-			'Bs2DsstPi':	0.005,
-			'Bs2DsRho':	0.005,
-		    },
-		'TagEff': {}, 'TagEff_t': {}, 'TagEff_f': {},
-                },
-        'DecayTimeResolutionModel':	'GaussianWithPEDTE',
-        'DecayTimeResolutionScaleFactor': 1.37,
-        'DecayTimeErrorTemplates': {
-                'Bs2DsK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsK',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bs2DsPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bs2DsRho': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsRho',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bs2DsstPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsstPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Lb2Dsp': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Lb2Dsp',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Lb2Dsstp': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Lb2Dsstp',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Lb2LcK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Lb2LcK',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Lb2LcPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Lb2LcPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bd2DK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bd2DK',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bd2DPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bd2DPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'CombBkg': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsK.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_CombBkg',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                },
-        'KFactorTemplates': {
-                'Bs2DsPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bs2DsPi_both',
-                    'VarName': 'kfactorVar', },
-                'Bs2DsstPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bs2DsstPi_both',
-                    'VarName': 'kfactorVar', },
-                'Bs2DsRho': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bs2DsRho_both',
-                    'VarName': 'kfactorVar', },
-                'Lb2LcK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Lb2LcK_both',
-                    'VarName': 'kfactorVar', },
-                'Lb2LcPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Lb2LcPi_both',
-                    'VarName': 'kfactorVar', },
-                'Lb2Dsp': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Lb2Dsp_both',
-                    'VarName': 'kfactorVar', },
-                'Lb2Dsstp': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Lb2Dsstp_both',
-                    'VarName': 'kfactorVar', },
-                'Bd2DK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bd2DK_both',
-                    'VarName': 'kfactorVar', },
-                'Bd2DPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bd2DPi_both',
-                    'VarName': 'kfactorVar', },
-                },
-        'AcceptanceFunction': 'Spline',
-        'constParams': [
-            'Gammas', 'deltaGammas', 'deltaMs',
-            'Gammad', 'deltaGammad', 'deltaMd',
-            'mistag', 'timeerr_bias', 'timeerr_scalefactor',
-            '.+_Mistag[0-9]+Calib(B|Bbar)_p[0-9]+',
-            'Bs2DsKst_TagEff[0-9]', 'Bs2DsKst_delta', 'Bs2DsKst_lambda', 'Bs2DsKst_phi_w',
-	    '.+Asym.+',
-            ],
-}
diff --git a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsKDATA-sFit.py b/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsKDATA-sFit.py
deleted file mode 100644
index 00896c74a7fdab02216a10ea96c75a04255da0a1..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsKDATA-sFit.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# personality for 2011 Paper - mode DsK for DATA
-{
-        'IsToy':                False,
-        'DataWorkSpaceName':    'FitMeToolWS',
-        'DataFileName': '/afs/cern.ch/work/a/adudziak/public/sWeights/sWeights_BsDsK_all_both_BDTGA.root',
-        'DataSetNames': 'merged',
-        'FitMode': 'sFit',
-        'Modes': [
-            'Bs2DsK',
-            'Bs2DsKst',
-            'Bs2DsPi', 'Bs2DsstPi', 'Bs2DsRho',
-            'Bd2DK', 'Bd2DPi', 'Bd2DsK',
-            'Lb2LcK', 'Lb2LcPi', 'Lb2Dsp', 'Lb2Dsstp',
-            'CombBkg'
-            ],
-        'SampleCategories': [
-            'nonres', 'phipi', 'kstk', 'kpipi', 'pipipi'
-            ],
-        'DeltaMs':                      17.768, # in ps^{-1}
-        'GammaLb':			0.700, # in ps^{-1}
-        'GammaCombBkg':			0.971, # in ps^{-1}
-        'WeakPhase': {
-            'Bs2DsK':           70. / 180. * pi,
-            'Bs2DsstK':         70. / 180. * pi,
-            'Bs2DsKst':         70. / 180. * pi,
-            'Bs2DsstKst':	70. / 180. * pi,
-            'Bd2DPi':           70. / 180. * pi
-            },
-        'StrongPhase': {
-            'Bs2DsK':           30. / 180. * pi,
-            'Bs2DsstK':         -150. / 180. * pi,
-            'Bs2DsKst':         -150. / 180. * pi,
-            'Bs2DsstKst':       30. / 180. * pi,
-            'Bd2DPi':           30. / 180. * pi
-            },
-        'CombineModesForEffCPObs': [ ],
-        'NEvents':			[ 3474. ],
-        'MassTemplateFile':             os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/WS_Mass_DsK_5M_BDTGA.root',
-        'MassTemplateWorkspace':	'FitMeToolWS',
-        'MassInterpolation':		False,
-        'MistagTemplateFile':           os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/templates_BsDsPi.root',
-        'MistagTemplateWorkspace':	'workspace',
-        'MistagTemplateName':	        'MistagPdf_signal_BDTGA',
-        'DecayTimeResolutionModel':	'GaussianWithPEDTE',
-        'DecayTimeResolutionScaleFactor': 1.37,
-        'DecayTimeErrorTemplateFile':   os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/templates_BsDsK.root',
-        'DecayTimeErrorTemplateWorkspace':  'workspace',
-        'DecayTimeErrorTemplateName':   'TimeErrorPdf_signal_BDTGA',
-        'DecayTimeErrorVarName':        'lab0_LifetimeFit_ctauErr',
-        'PowLawAcceptance_turnon':	1.3291e+00,
-        'PowLawAcceptance_offset':	1.6710e-02,
-        'PowLawAcceptance_expo':	1.8627e+00,
-        'PowLawAcceptance_beta':	3.4938e-02,
-        'NBinsAcceptance':              600,
-        'constParams': [
-            'Gammas', 'deltaGammas', 'deltaMs',
-            'Gammad', 'deltaGammad', 'deltaMd',
-            'mistag', 'timeerr_bias', 'timeerr_scalefactor',
-            'MistagCalibB_p0', 'MistagCalibB_p1', 'MistagCalibB_avgmistag',
-            'MistagCalibBbar_p0', 'MistagCalibBbar_p1', 'MistagCalibBbar_avgmistag',
-            'Bs2DsKst_TagEff', 'Bs2DsKst_delta', 'Bs2DsKst_lambda', 'Bs2DsKst_phi_w',
-            ],
-        'Constraints': {
-                'Bd2DPi_lambda': 0.3 * 0.0187,
-                'Bd2DPi_avgSSbar': [ '0.5*(@0+@1)', ['Bd2DPi_S', 'Bd2DPi_Sbar'], +0.046, 0.023 ],
-                'Bd2DPi_difSSbar': [ '0.5*(@0-@1)', ['Bd2DPi_S', 'Bd2DPi_Sbar'], -0.022, 0.021 ],
-                },
-}
diff --git a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsKDATA.py b/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsKDATA.py
deleted file mode 100644
index 9e4a94d4dc91a71dd6da22e01967067df9d42a9e..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsKDATA.py
+++ /dev/null
@@ -1,378 +0,0 @@
-# personality for 2011 Paper - mode DsK for DATA
-{
-        'IsToy':                False,
-        'DataFileName':         ('/afs/cern.ch/work/g/gligorov/public/Bs2DsKPlotsForPaper/NominalFit/WS_Mass_DsK_5M_BDTGA.root' if haveAFS else
-	    os.environ['B2DXFITTERSROOT']+'/scripts/paperv3a-dsk-DATA/NominalFit/WS_Mass_DsK_5M_BDTGA.root'),
-        'DataWorkSpaceName':    'FitMeToolWS',
-        'DataSetNames':         'combData',
-        'Modes': [
-            'Bs2DsK',
-            'Bs2DsKst',
-            'Bs2DsPi', 'Bs2DsstPi', 'Bs2DsRho',
-            'Bd2DK', 'Bd2DPi', 'Bd2DsK',
-            'Lb2LcK', 'Lb2LcPi', 'Lb2Dsp', 'Lb2Dsstp',
-            'CombBkg'
-            ],
-        'SampleCategories': [
-            'nonres', 'phipi', 'kstk', 'kpipi', 'pipipi'
-            ],
-        'DeltaMs':                      17.768, # in ps^{-1}
-        'GammaLb':			0.676, # in ps^{-1}
-        'WeakPhase': {
-            'Bs2DsK':           70. / 180. * pi,
-            'Bs2DsstK':         70. / 180. * pi,
-            'Bs2DsKst':         70. / 180. * pi,
-            'Bs2DsstKst':	70. / 180. * pi,
-            'Bd2DPi':           70. / 180. * pi
-            },
-        'StrongPhase': {
-            'Bs2DsK':           30. / 180. * pi,
-            'Bs2DsstK':         -150. / 180. * pi,
-            'Bs2DsKst':         -150. / 180. * pi,
-            'Bs2DsstKst':       30. / 180. * pi,
-            'Bd2DPi':           30. / 180. * pi
-            },
-        'CombineModesForEffCPObs': [ ],
-        'NEvents':			[ 3474. ],
-	'DataSetVarNameMapping': {
-	    'sample':   'sample',
-	    'mass':     'lab0_MassFitConsD_M',
-	    'pidk':     'lab1_PIDK',
-            'dsmass':   'lab2_MM',
-            'time':     'lab0_LifetimeFit_ctau',
-            'timeerr':  'lab0_LifetimeFit_ctauErr',
-            'mistag':   'tagOmegaComb',
-            'qf':       'lab1_ID',
-            'qt':       'tagDecComb',
-            'weight':   'nSig_both_nonres_Evts_sw+nSig_both_phipi_Evts_sw+nSig_both_kstk_Evts_sw+nSig_both_kpipi_Evts_sw+nSig_both_pipipi_Evts_sw'
-            },
-	'GammaCombBkg':     [0.744946,0.912933,1.45079,1.37116],
-	'DGammaCombBkg':    [0.753119,0.845346,1.26635,1.2823],
-	'CombBkg_D':	    [-0.938334,-0.907821,-0.775118,-0.913433],
-        'FitRanges': {
-		'time':     [0.4, 15.],
-		'timeerr':  [1e-6, 0.25],
-		'mistag':   [0., 0.5],
-		'mass':     [5320., 5420.],
-		'dsmass':   [1930., 2015.],
-		'pidk':     [0., 150.]
-		},
-        'MassTemplateFile':         ('/afs/cern.ch/work/g/gligorov/public/Bs2DsKPlotsForPaper/NominalFit/WS_Mass_DsK_5M_BDTGA.root' if haveAFS else
-	    os.environ['B2DXFITTERSROOT']+'/scripts/paperv3a-dsk-DATA/NominalFit/WS_Mass_DsK_5M_BDTGA.root'),
-        'MassTemplateWorkspace':	'FitMeToolWS',
-        'MassInterpolation':		False,
-        'NTaggers':                     3,
-        'TagEff':                    {
-            'Bs2DsK': [ 0.3870 * (1. - 0.4772), 0.4772 * (1. - 0.3870), 0.3870 * 0.4772 ],
-            'Lb': [ 0.3870, 0.4772 ],
-            'Bd': [ 0.3870, 0.4772 ],
-            },
-        'MistagTemplates': {
-            'Bs2DsK': [
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_3',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            'Bd2DPi': [
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BDPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BDPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BDPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_3',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            'CombBkg': [
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_3',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            },
-        'MistagCalibrationParams': {
-                'Bs2DsK': [
-                    [ [ 0.376730, 1.048155, 0.371147 ], [ 0.365517, 0.950216, 0.371147 ] ],
-                    [ [ 0.404896, 0.995879, 0.414892 ], [ 0.424801, 1.004340, 0.414892 ] ],
-                    [ [ 0.338363, 1.027861, 0.338493 ], [ 0.338781, 0.971845, 0.338493 ] ],
-                    ],
-                'Bd': [
-                    [ [ 0.376730, 1.048155, 0.371147 ], [ 0.365517, 0.950216, 0.371147 ] ],
-                    [ [ 0.5, 0., 0. ], [ 0.5, 0., 0. ] ],
-                    [ [ 0.338363, 1.027861, 0.338493 ], [ 0.338781, 0.971845, 0.338493 ] ],
-                    ],
-                },
-        'Constraints': {
-                'GammaLb': 0.006,
-                'Bd2DPi_lambda': 0.3 * 0.0187,
-                'Bd2DPi_avgSSbar': [ '0.5*(@0+@1)', ['Bd2DPi_S', 'Bd2DPi_Sbar'], +0.046, 0.023 ],
-                'Bd2DPi_difSSbar': [ '0.5*(@0-@1)', ['Bd2DPi_S', 'Bd2DPi_Sbar'], -0.022, 0.021 ],
-                'Bd_AsymProd': 0.01,
-		'Bs_AsymProd': 0.01,
-		'Lb_AsymProd': 0.03,
-		'CombBkg_AsymProd':     0.03,
-		'Bs2DsK_AsymDet':	0.005,
-		'Bd2DK_AsymDet':	0.01,
-		'Bd2DPi_AsymDet':	0.01,
-		'Bd2DsK_AsymDet':	0.01,
-		'Bs2DsPi_AsymDet':	0.01,
-		'Lb2LcK_AsymDet':	0.03,
-		'Lb2LcPi_AsymDet':	0.03,
-		'CombBkg_AsymDet':	0.01,
-		'Lb2Dsp_AsymDet':	0.03,
-		'Lb2Dsstp_AsymDet':	0.03,
-		'Bs2DsstPi_AsymDet':	0.01,
-		'Bs2DsRho_AsymDet':	0.01,
-                'multivar_Bs2DsKMistagCalib_p0p1': [
-                    [   'Bs2DsK_Mistag0CalibB_p0', 'Bs2DsK_Mistag0CalibB_p1',
-                        'Bs2DsK_Mistag1CalibB_p0', 'Bs2DsK_Mistag1CalibB_p1',
-                        'Bs2DsK_Mistag2CalibB_p0', 'Bs2DsK_Mistag2CalibB_p1',
-                        'Bs2DsK_Mistag0CalibBbar_p0', 'Bs2DsK_Mistag0CalibBbar_p1',
-                        'Bs2DsK_Mistag1CalibBbar_p0', 'Bs2DsK_Mistag1CalibBbar_p1',
-                        'Bs2DsK_Mistag2CalibBbar_p0', 'Bs2DsK_Mistag2CalibBbar_p1', ],
-                    [   0.004389, 0.039917, 0.007146, 0.148797, 0.005959, 0.038725,
-                        0.004395, 0.040072, 0.011414, 0.150355, 0.006030, 0.039962, ],
-                    [   [  1.000000000, -0.111790756,  0.000000000,  0.000000000,  0.495659195, -0.121263673,  0.883403568, -0.090341177,  0.000000000,  0.000000000,  0.436308995, -0.115934567 ],
-                        [ -0.111790756,  1.000000000,  0.000000000,  0.000000000, -0.170723691,  0.368653977, -0.090433543,  0.808300854,  0.000000000,  0.000000000, -0.138612127,  0.303210400 ],
-                        [  0.000000000,  0.000000000,  1.000000000, -0.122610568,  0.658158523, -0.541239353,  0.000000000,  0.000000000,  0.938782519, -0.120298908,  0.633382320, -0.525375965 ],
-                        [  0.000000000,  0.000000000, -0.122610568,  1.000000000, -0.631056425,  0.811985505,  0.000000000,  0.000000000, -0.122445304,  0.986409445, -0.608419498,  0.787887823 ],
-                        [  0.495659195, -0.170723691,  0.658158523, -0.631056425,  1.000000000, -0.874463407,  0.436823522, -0.137898963,  0.622128000, -0.622176239,  0.940276558, -0.841479510 ],
-                        [ -0.121263673,  0.368653977, -0.541239353,  0.811985505, -0.874463407,  1.000000000, -0.104272659,  0.297793832, -0.514032745,  0.800698231, -0.830102616,  0.950602614 ],
-                        [  0.883403568, -0.090433543,  0.000000000,  0.000000000,  0.436823522, -0.104272659,  1.000000000, -0.111883376,  0.000000000,  0.000000000,  0.494752953, -0.134191009 ],
-                        [ -0.090341177,  0.808300854,  0.000000000,  0.000000000, -0.137898963,  0.297793832, -0.111883376,  1.000000000,  0.000000000,  0.000000000, -0.170921923,  0.374807565 ],
-                        [  0.000000000,  0.000000000,  0.938782519, -0.122445304,  0.622128000, -0.514032745,  0.000000000,  0.000000000,  1.000000000, -0.123454584,  0.672735926, -0.556618676 ],
-                        [  0.000000000,  0.000000000, -0.120298908,  0.986409445, -0.622176239,  0.800698231,  0.000000000,  0.000000000, -0.123454584,  1.000000000, -0.616497607,  0.798523473 ],
-                        [  0.436308995, -0.138612127,  0.633382320, -0.608419498,  0.940276558, -0.830102616,  0.494752953, -0.170921923,  0.672735926, -0.616497607,  1.000000000, -0.878334170 ],
-                        [ -0.115934567,  0.303210400, -0.525375965,  0.787887823, -0.841479510,  0.950602614, -0.134191009,  0.374807565, -0.556618676,  0.798523473, -0.878334170,  1.000000000 ], ],
-                    ],
-                'multivar_BdMistagCalib_p0p1': [
-                    [   'Bd_Mistag0CalibB_p0', 'Bd_Mistag0CalibB_p1',
-                        'Bd_Mistag2CalibB_p0', 'Bd_Mistag2CalibB_p1',
-                        'Bd_Mistag0CalibBbar_p0', 'Bd_Mistag0CalibBbar_p1',
-                        'Bd_Mistag2CalibBbar_p0', 'Bd_Mistag2CalibBbar_p1', ],
-                    [   0.004389, 0.039917, 0.005959, 0.038725,
-                        0.004395, 0.040072, 0.006030, 0.039962, ],
-                    [   [  1.000000000, -0.111790756,  0.495659195, -0.121263673,  0.883403568, -0.090341177,  0.436308995, -0.115934567 ],
-                        [ -0.111790756,  1.000000000, -0.170723691,  0.368653977, -0.090433543,  0.808300854, -0.138612127,  0.303210400 ],
-                        [  0.495659195, -0.170723691,  1.000000000, -0.874463407,  0.436823522, -0.137898963,  0.940276558, -0.841479510 ],
-                        [ -0.121263673,  0.368653977, -0.874463407,  1.000000000, -0.104272659,  0.297793832, -0.830102616,  0.950602614 ],
-                        [  0.883403568, -0.090433543,  0.436823522, -0.104272659,  1.000000000, -0.111883376,  0.494752953, -0.134191009 ],
-                        [ -0.090341177,  0.808300854, -0.137898963,  0.297793832, -0.111883376,  1.000000000, -0.170921923,  0.374807565 ],
-                        [  0.436308995, -0.138612127,  0.940276558, -0.830102616,  0.494752953, -0.170921923,  1.000000000, -0.878334170 ],
-                        [ -0.115934567,  0.303210400, -0.841479510,  0.950602614, -0.134191009,  0.374807565, -0.878334170,  1.000000000 ], ],
-                    ],
-                'multivar_Bs2DsKTagEffAsyms': [
-                        [   'Bs2DsK_TagEff0', 'Bs2DsK_TagEff1', 'Bs2DsK_TagEff2',
-                            'Bs2DsK_AsymTagEff0', 'Bs2DsK_AsymTagEff1', 'Bs2DsK_AsymTagEff2' ],
-                        [   0.001952, 0.002330, 0.001843, 0.001628, 0.001029, 0.001629 ],
-                        [   [   1.0000000000000000e+00,  -9.6310597862753633e-01,   2.4948159233783404e-01,   1.0144953478135443e-02,   7.0203224420703663e-03,   1.0233976427853671e-02 ],
-                            [  -9.6310597862753633e-01,   1.0000000000000000e+00,   2.0335415458912924e-02,  -8.0556554583657968e-03,  -5.7778847902391142e-03,  -8.1729979402554217e-03 ],
-                            [   2.4948159233783404e-01,   2.0335415458912924e-02,   1.0000000000000000e+00,   8.9803482925014111e-03,   5.0106145332872738e-03,   8.8849526862593686e-03 ],
-                            [   1.0144953478135443e-02,  -8.0556554583657968e-03,   8.9803482925014111e-03,   1.0000000000000000e+00,  -9.9965299841531974e-01,   9.9878828433569355e-01 ],
-                            [   7.0203224420703663e-03,  -5.7778847902391142e-03,   5.0106145332872738e-03,  -9.9965299841531974e-01,   1.0000000000000000e+00,  -9.9759036187377381e-01 ],
-                            [   1.0233976427853671e-02,  -8.1729979402554217e-03,   8.8849526862593686e-03,   9.9878828433569355e-01,  -9.9759036187377381e-01,   1.0000000000000000e+00 ], ],
-                    ],
-                'multivar_Bs2DsPiTagEffAsyms': [
-                        [   'Bs2DsPi_TagEff0', 'Bs2DsPi_TagEff1', 'Bs2DsPi_TagEff2',
-                            'Bs2DsPi_AsymTagEff0', 'Bs2DsPi_AsymTagEff1', 'Bs2DsPi_AsymTagEff2' ],
-                        [   0.001952, 0.002330, 0.001843, 0.001628, 0.001029, 0.001629 ],
-                        [   [   1.0000000000000000e+00,  -9.6310597862753633e-01,   2.4948159233783404e-01,   1.0144953478135443e-02,   7.0203224420703663e-03,   1.0233976427853671e-02 ],
-                            [  -9.6310597862753633e-01,   1.0000000000000000e+00,   2.0335415458912924e-02,  -8.0556554583657968e-03,  -5.7778847902391142e-03,  -8.1729979402554217e-03 ],
-                            [   2.4948159233783404e-01,   2.0335415458912924e-02,   1.0000000000000000e+00,   8.9803482925014111e-03,   5.0106145332872738e-03,   8.8849526862593686e-03 ],
-                            [   1.0144953478135443e-02,  -8.0556554583657968e-03,   8.9803482925014111e-03,   1.0000000000000000e+00,  -9.9965299841531974e-01,   9.9878828433569355e-01 ],
-                            [   7.0203224420703663e-03,  -5.7778847902391142e-03,   5.0106145332872738e-03,  -9.9965299841531974e-01,   1.0000000000000000e+00,  -9.9759036187377381e-01 ],
-                            [   1.0233976427853671e-02,  -8.1729979402554217e-03,   8.8849526862593686e-03,   9.9878828433569355e-01,  -9.9759036187377381e-01,   1.0000000000000000e+00 ], ],
-                    ],
-		'multivar_CombBkg0Lifetime': [
-			[ 'CombBkg0_D', 'GammaCombBkg0', 'DeltaGammaCombBkg0' ],
-			[ 0.079068, 0.132645, 0.0936984 ],
-			[ [  1.000,  0.965, -0.537 ],
-			  [  0.965,  1.000, -0.389 ],
-			  [ -0.537, -0.389,  1.000 ], ],
-			],
-		'multivar_CombBkg1Lifetime': [
-			[ 'CombBkg1_D', 'GammaCombBkg1', 'DeltaGammaCombBkg1' ],
-			[ 0.0717398, 0.106405, 0.0931906 ],
-			[ [  1.000,  0.925, -0.342 ],
-			  [  0.925,  1.000, -0.064 ],
-			  [ -0.342, -0.064,  1.000 ], ],
-			],
-		'multivar_CombBkg2Lifetime': [
-			[ 'CombBkg2_D', 'GammaCombBkg2', 'DeltaGammaCombBkg2' ],
-			[ 0.131338, 0.226203, 0.265759 ],
-			[ [ 1.000,  0.763,  0.260 ],
-			  [ 0.763,  1.000,  0.789 ],
-			  [ 0.260,  0.789,  1.000 ], ],
-			],
-		'multivar_CombBkg3Lifetime': [
-			[ 'CombBkg3_D', 'GammaCombBkg3', 'DeltaGammaCombBkg3' ],
-			[ 0.068232, 0.18301, 0.132948 ],
-			[ [ 1.000,  0.931,  0.092 ],
-			  [ 0.931,  1.000,  0.383 ],
-			  [ 0.092,  0.383,  1.000 ], ],
-			],
-                },
-        'Asymmetries': {
-                'Prod': {
-		    'Bs': -0.014,
-		    'Bd': 0.011,
-		    'Lb': 0.03,
-		    'CombBkg': -0.01,
-		    },
-		'Det': {
-		        'Bs2DsK':	0.01,
-			'Bd2DK':	0.01,
-			'Bd2DPi':	0.005,
-			'Bd2DsK':	0.01,
-			'Bs2DsPi':	0.005,
-			'Lb2LcK':	0.01,
-			'Lb2LcPi':	0.005,
-			'CombBkg':	0.01,
-			'Lb2Dsp':	0.02,
-			'Lb2Dsstp':	0.02,
-			'Bs2DsstPi':	0.005,
-			'Bs2DsRho':	0.005,
-		    },
-                'TagEff': {
-                        'Bs2DsK':   [ -0.002756, 0.001837, -0.002315 ],
-                        'Bs2DsPi':  [ -0.002756, 0.001837, -0.002315 ],
-                    },
-                'TagEff_t': {}, 'TagEff_f': {},
-                },
-        'DecayTimeResolutionModel':	'GaussianWithPEDTE',
-        'DecayTimeResolutionScaleFactor': 1.37,
-        'DecayTimeErrorTemplates': {
-                'Bs2DsK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsK',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bs2DsPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bs2DsRho': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsRho',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bs2DsstPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsstPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Lb2Dsp': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Lb2Dsp',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Lb2Dsstp': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Lb2Dsstp',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Lb2LcK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Lb2LcK',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Lb2LcPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Lb2LcPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bd2DK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bd2DK',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bd2DPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bd2DPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'CombBkg': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_CombBkg',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                },
-        'KFactorTemplates': {
-                'Bs2DsPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bs2DsPi_both',
-                    'VarName': 'kfactorVar', },
-                'Bs2DsstPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bs2DsstPi_both',
-                    'VarName': 'kfactorVar', },
-                'Bs2DsRho': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bs2DsRho_both',
-                    'VarName': 'kfactorVar', },
-                'Lb2LcK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Lb2LcK_both',
-                    'VarName': 'kfactorVar', },
-                'Lb2LcPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Lb2LcPi_both',
-                    'VarName': 'kfactorVar', },
-                'Lb2Dsp': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Lb2Dsp_both',
-                    'VarName': 'kfactorVar', },
-                'Lb2Dsstp': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Lb2Dsstp_both',
-                    'VarName': 'kfactorVar', },
-                'Bd2DK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bd2DK_both',
-                    'VarName': 'kfactorVar', },
-                'Bd2DPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bd2DPi_both',
-                    'VarName': 'kfactorVar', },
-                },
-        'AcceptanceFunction': 'Spline',
-        'constParams': [
-            'Gammas', 'deltaGammas', 'deltaMs',
-            'Gammad', 'deltaGammad', 'deltaMd',
-            'mistag', 'timeerr_bias', 'timeerr_scalefactor',
-            '.+_Mistag[0-9]+Calib(B|Bbar)_p[0-9]+',
-            'Bs2DsKst_TagEff[0-9]', 'Bs2DsKst_delta', 'Bs2DsKst_lambda', 'Bs2DsKst_phi_w',
-	    '.+Asym.+',
-            ],
-}
diff --git a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsPi-Agn70-sFit.py b/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsPi-Agn70-sFit.py
deleted file mode 100644
index 4d3cc9512ac54bb42f1ae6e86b752c7887fe6fc9..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsPi-Agn70-sFit.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# personality for 2011 Paper - mode DsPi
-{
-        'Modes': [
-            'Bs2DsPi',
-            'Bd2DPi', 'Bs2DsstPi',
-            'Bd2DsPi',
-            'Bs2DsK',
-            'Lb2LcPi',
-            'CombBkg'
-            ],
-        'SampleCategories': [
-            'phipi'
-            ],
-        'DeltaMs':                      17.768, # in ps^{-1}
-        'GammaLb':			0.700, # in ps^{-1}
-        'GammaCombBkg':			1.057, # in ps^{-1}
-        'WeakPhase': {
-            'Bs2DsK':           70. / 180. * pi,
-            'Bs2DsstK':         70. / 180. * pi,
-            'Bs2DsKst':         70. / 180. * pi,
-            'Bs2DsstKst':	70. / 180. * pi,
-            'Bd2DPi':           70. / 180. * pi
-            },
-        'StrongPhase': {
-            'Bs2DsK':           30. / 180. * pi,
-            'Bs2DsstK':         -150. / 180. * pi,
-            'Bs2DsKst':         -150. / 180. * pi,
-            'Bs2DsstKst':       30. / 180. * pi,
-            'Bd2DPi':           30. / 180. * pi
-            },
-        'CombineModesForEffCPObs': [ ],
-        'Bs2DsKCPObs':                  'LambdaPhases',
-        'NEvents':			[ 33672. ],
-        'DataFileName': '/afs/cern.ch/work/a/adudziak/public/Bs2DsPiToys/PETE/DsPi_Toys1M_sWeights_ForTimeFit_%d.root' % TOY_NUMBER,
-        'DataSetNames': 'merged',
-        'FitMode': 'sFit',
-        'DataWorkSpaceName':    'FitMeToolWS',
-	'DataSetVarNameMapping': {
-	    'sample':   'sample',
-	    'mass':     'lab0_MassFitConsD_M',
-	    'pidk':     'lab1_PIDK',
-            'dsmass':   'lab2_MM',
-            'time':     'lab0_LifetimeFit_ctau',
-            'timeerr':  'lab0_LifetimeFit_ctauErr',
-            'mistag': 'lab0_BsTaggingTool_TAGOMEGA_OS',
-            'qf':       'lab1_ID_idx',
-            'qt':       'lab0_BsTaggingTool_TAGDECISION_OS_idx',
-            'weight':   'nSig_both_nonres_Evts_sw+nSig_both_phipi_Evts_sw+nSig_both_kstk_Evts_sw+nSig_both_kpipi_Evts_sw+nSig_both_pipipi_Evts_sw'
-            },
-        'MassTemplateFile':             ('/afs/cern.ch/work/a/adudziak/public/Bs2DsPiToys/PETE/DsPi_Toys_Work_ForMassPlot_%d.root' if haveAFS else
-            os.environ['B2DXFITTERSROOT']+'/scripts/mdfit-005/data/DsPi_Toys_Work_ForMassPlot_%d.root') % TOY_NUMBER,
-        'MassTemplateWorkspace':	'FitMeToolWS',
-        'MassInterpolation':		False,
-        'MistagTemplateFile':           os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/templates_BsDsPi.root',
-        'MistagTemplateWorkspace':	'workspace',
-        'MistagTemplateName':	        'MistagPdf_signal_BDTGA',
-        'DecayTimeResolutionModel':	'GaussianWithPEDTE',
-        'DecayTimeResolutionScaleFactor': 1.37,
-        'DecayTimeErrorTemplateFile':       os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/templates_BsDsPi.root',
-        'DecayTimeErrorTemplateWorkspace':  'workspace',
-        'DecayTimeErrorTemplateName':       'TimeErrorPdf_signal_BDTGA',
-        'DecayTimeErrorVarName':            'lab0_LifetimeFit_ctauErr',
-        'PowLawAcceptance_turnon':	1.3291e+00,
-        'PowLawAcceptance_offset':	1.6710e-02,
-        'PowLawAcceptance_expo':	1.8627e+00,
-        'PowLawAcceptance_beta':	3.4938e-02,
-        'AcceptanceCorrectionFile':     None,
-        'AcceptanceCorrectionHistName': None,
-        'NBinsAcceptance':              600,
-        'constParams': [
-            'Gammas', 'deltaGammas',
-            'Gammad', 'deltaGammad', 'deltaMd',
-            'mistag', 'timeerr_bias', 'timeerr_scalefactor',
-            'MistagCalibB_p0', 'MistagCalibB_p1', 'MistagCalibB_avgmistag',
-            'MistagCalibBbar_p0', 'MistagCalibBbar_p1', 'MistagCalibBbar_avgmistag',
-            'Bs2DsKst_TagEff', 'Bs2DsKst_delta', 'Bs2DsKst_lambda', 'Bs2DsKst_phi_w',
-            ],
-}
diff --git a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsPi-Agn70.py b/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsPi-Agn70.py
deleted file mode 100644
index 9ae266f80aaa561a09e9edf71939f67b94b6d044..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsPi-Agn70.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# personality for 2011 Paper - mode DsPi
-{
-        'Modes': [
-            'Bs2DsPi',
-            'Bd2DPi', 'Bs2DsstPi',
-            'Bd2DsPi',
-            'Bs2DsK',
-            'Lb2LcPi',
-            'CombBkg'
-            ],
-        'SampleCategories': [
-            'phipi'
-            ],
-        'DeltaMs':                      17.768, # in ps^{-1}
-        'GammaLb':			0.700, # in ps^{-1}
-        'GammaCombBkg':			1.057, # in ps^{-1}
-        'WeakPhase': {
-            'Bs2DsK':           70. / 180. * pi,
-            'Bs2DsstK':         70. / 180. * pi,
-            'Bs2DsKst':         70. / 180. * pi,
-            'Bs2DsstKst':	70. / 180. * pi,
-            'Bd2DPi':           70. / 180. * pi
-            },
-        'StrongPhase': {
-            'Bs2DsK':           30. / 180. * pi,
-            'Bs2DsstK':         -150. / 180. * pi,
-            'Bs2DsKst':         -150. / 180. * pi,
-            'Bs2DsstKst':       30. / 180. * pi,
-            'Bd2DPi':           30. / 180. * pi
-            },
-        'CombineModesForEffCPObs': [ ],
-        'Bs2DsKCPObs':                  'LambdaPhases',
-        'NEvents':			[ 33672. ],
-        'DataFileName':         ('/afs/cern.ch/work/a/adudziak/public/Bs2DsPiToys/PETE/DsPi_Toys_Work_ForMassPlot_%d.root' if haveAFS else
-            os.environ['B2DXFITTERSROOT']+'/scripts/mdfit-005/data/DsPi_Toys_Work_ForMassPlot_%d.root') % TOY_NUMBER,
-        'DataWorkSpaceName':    'FitMeToolWS',
-        'DataSetNames':         'combData',
-	'DataSetVarNameMapping': {
-	    'sample':   'sample',
-	    'mass':     'lab0_MassFitConsD_M',
-	    'pidk':     'lab1_PIDK',
-            'dsmass':   'lab2_MM',
-            'time':     'lab0_LifetimeFit_ctau',
-            'timeerr':  'lab0_LifetimeFit_ctauErr',
-            'mistag': 'lab0_BsTaggingTool_TAGOMEGA_OS',
-            'qf':       'lab1_ID_idx',
-            'qt':       'lab0_BsTaggingTool_TAGDECISION_OS_idx',
-            'weight':   'nSig_both_nonres_Evts_sw+nSig_both_phipi_Evts_sw+nSig_both_kstk_Evts_sw+nSig_both_kpipi_Evts_sw+nSig_both_pipipi_Evts_sw'
-            },
-        'MassTemplateFile':             ('/afs/cern.ch/work/a/adudziak/public/Bs2DsPiToys/PETE/DsPi_Toys_Work_ForMassPlot_%d.root' if haveAFS else
-            os.environ['B2DXFITTERSROOT']+'/scripts/mdfit-005/data/DsPi_Toys_Work_ForMassPlot_%d.root') % TOY_NUMBER,
-        'MassTemplateWorkspace':	'FitMeToolWS',
-        'MassInterpolation':		False,
-        'MistagTemplateFile':           os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/templates_BsDsPi.root',
-        'MistagTemplateWorkspace':	'workspace',
-        'MistagTemplateName':	        'MistagPdf_signal_BDTGA',
-        'DecayTimeResolutionModel':	'GaussianWithPEDTE',
-        'DecayTimeResolutionScaleFactor': 1.37,
-        'DecayTimeErrorTemplateFile':       os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/templates_BsDsPi.root',
-        'DecayTimeErrorTemplateWorkspace':  'workspace',
-        'DecayTimeErrorTemplateName':       'TimeErrorPdf_signal_BDTGA',
-        'DecayTimeErrorVarName':            'lab0_LifetimeFit_ctauErr',
-        'PowLawAcceptance_turnon':	1.3291e+00,
-        'PowLawAcceptance_offset':	1.6710e-02,
-        'PowLawAcceptance_expo':	1.8627e+00,
-        'PowLawAcceptance_beta':	3.4938e-02,
-        'AcceptanceCorrectionFile':     None,
-        'AcceptanceCorrectionHistName': None,
-        'NBinsAcceptance':              600,
-        'constParams': [
-            'Gammas', 'deltaGammas',
-            'Gammad', 'deltaGammad', 'deltaMd',
-            'mistag', 'timeerr_bias', 'timeerr_scalefactor',
-            'MistagCalibB_p0', 'MistagCalibB_p1', 'MistagCalibB_avgmistag',
-            'MistagCalibBbar_p0', 'MistagCalibBbar_p1', 'MistagCalibBbar_avgmistag',
-            'Bs2DsKst_TagEff', 'Bs2DsKst_delta', 'Bs2DsKst_lambda', 'Bs2DsKst_phi_w',
-            ],
-}
diff --git a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsPi.py b/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsPi.py
deleted file mode 100644
index d563a669f3242aef04ff905080bdc01ea985cf6b..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsPi.py
+++ /dev/null
@@ -1,181 +0,0 @@
-# personality for 2011 Paper - mode DsPi
-{
-        'Modes': [
-            'Bs2DsPi',
-            'Bd2DPi', 'Bs2DsstPi',
-            'Bd2DsPi',
-            'Bs2DsK',
-            'Lb2LcPi',
-            'CombBkg'
-            ],
-        'SampleCategories': [
-            'nonres', 'phipi', 'kstk', 'kpipi', 'pipipi'
-            ],
-        'DeltaMs':                      17.768, # in ps^{-1}
-        'GammaLb':			0.700, # in ps^{-1}
-        'GammaCombBkg':			1.057, # in ps^{-1}
-        'WeakPhase': {
-            'Bs2DsK':           70. / 180. * pi,
-            'Bs2DsstK':         70. / 180. * pi,
-            'Bs2DsKst':         70. / 180. * pi,
-            'Bs2DsstKst':	70. / 180. * pi,
-            'Bd2DPi':           70. / 180. * pi
-            },
-        'StrongPhase': {
-            'Bs2DsK':           30. / 180. * pi,
-            'Bs2DsstK':         -150. / 180. * pi,
-            'Bs2DsKst':         -150. / 180. * pi,
-            'Bs2DsstKst':       30. / 180. * pi,
-            'Bd2DPi':           30. / 180. * pi
-            },
-        'CombineModesForEffCPObs': [ ],
-        'Bs2DsKCPObs':                  'LambdaPhases',
-        'NEvents':			[ 33672. ],
-        'MassTemplateFile':             os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/WS_Mass_DsPi_5M_BDTGA.root',
-        'MassTemplateWorkspace':	'FitMeToolWS',
-        'MassInterpolation':		False,
-        'NTaggers':                     3,
-        'TagEff':                    {
-            'Bs2DsPi': [ 0.3870 * (1. - 0.4772), 0.4772 * (1. - 0.3870), 0.3870 * 0.4772 ],
-            'Lb': [ 0.3870, 0.4772 ],
-            'Bd': [ 0.3870, 0.4772 ],
-            },
-        'MistagTemplates': {
-            'Bs2DsPi': [
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_3',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            'Bd2DPi': [
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BDPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BDPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BDPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_3',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            'CombBkg': [
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_3',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            },
-        'MistagCalibrationParams': {
-                'Bs2DsPi': [
-                    [ [ 0., 1., 0. ] ],
-                    [ [ 0., 1., 0. ] ],
-                    [ [ 0., 1., 0. ] ],
-                    ],
-                'Bd': [
-                    [ [ 0., 1., 0. ] ],
-                    [ [ 0.5, 0., 0. ] ],
-                    [ [ 0., 1., 0. ] ],
-                    ],
-                },
-        'Asymmetries': {
-                'Prod': {}, 'Det': { }, 'TagEff': {}, 'TagEff_t': {}, 'TagEff_f': {},
-                },
-        'DecayTimeResolutionModel':	'GaussianWithPEDTE',
-        'DecayTimeResolutionScaleFactor': 1.37,
-        'DecayTimeErrorTemplates': {
-                'Bs2DsK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsK',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bs2DsPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bs2DsstPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsstPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Lb2LcPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Lb2LcPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bd2DPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bd2DPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'CombBkg': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_CombBkg',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                },
-        #'KFactorTemplates': {
-        #        'Bs2DsPi': {
-        #            'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5300_5800.root',
-        #            'Workspace': 'workspace',
-        #            'TemplateName': 'kFactor_Bs2DsPi_both',
-        #            'VarName': 'kfactorVar', },
-        #        'Bs2DsstPi': {
-        #            'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5300_5800.root',
-        #            'Workspace': 'workspace',
-        #            'TemplateName': 'kFactor_Bs2DsstPi_both',
-        #            'VarName': 'kfactorVar', },
-        #        'Bs2DsRho': {
-        #            'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5300_5800.root',
-        #            'Workspace': 'workspace',
-        #            'TemplateName': 'kFactor_Bs2DsRho_both',
-        #            'VarName': 'kfactorVar', },
-        #        'Lb2LcK': {
-        #            'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5300_5800.root',
-        #            'Workspace': 'workspace',
-        #            'TemplateName': 'kFactor_Lb2LcK_both',
-        #            'VarName': 'kfactorVar', },
-        #        'Lb2Dsp': {
-        #            'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5300_5800.root',
-        #            'Workspace': 'workspace',
-        #            'TemplateName': 'kFactor_Lb2Dsp_both',
-        #            'VarName': 'kfactorVar', },
-        #        'Lb2Dsstp': {
-        #            'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5300_5800.root',
-        #            'Workspace': 'workspace',
-        #            'TemplateName': 'kFactor_Lb2Dsstp_both',
-        #            'VarName': 'kfactorVar', },
-        #        'Bd2DK': {
-        #            'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5300_5800.root',
-        #            'Workspace': 'workspace',
-        #            'TemplateName': 'kFactor_Bd2DK_both',
-        #            'VarName': 'kfactorVar', },
-        #        },
-        'AcceptanceFunction': 'Spline',
-        'constParams': [
-            'Gammas', 'deltaGammas',
-            'Gammad', 'deltaGammad', 'deltaMd',
-            'mistag', 'timeerr_bias', 'timeerr_scalefactor',
-            '.+_Mistag[0-9]+Calib(B|Bbar)_p[0-9]+',
-            'Bs2DsKst_TagEff[0-9]', 'Bs2DsKst_delta', 'Bs2DsKst_lambda', 'Bs2DsKst_phi_w',
-            ],
-}
diff --git a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsPiDATA-sFit.py b/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsPiDATA-sFit.py
deleted file mode 100644
index 962fb9867e7cdf29a2fa64b2dcf2f82f327a8e3a..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsPiDATA-sFit.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# personality for 2011 Paper - mode DsPi
-{
-        'IsToy':                False,
-        'DataWorkSpaceName':    'FitMeToolWS',
-        'DataFileName': '/afs/cern.ch/work/a/adudziak/public/sWeights/sWeights_BsDsPi_all_both_BDTGA.root',
-        'DataSetNames': 'merged',
-        'FitMode': 'sFit',
-        'Modes': [
-            'Bs2DsPi',
-            'Bd2DPi', 'Bs2DsstPi',
-            'Bd2DsPi',
-            'Bs2DsK',
-            'Lb2LcPi',
-            'CombBkg'
-            ],
-        'SampleCategories': [
-            'nonres', 'phipi', 'kstk', 'kpipi', 'pipipi'
-            ],
-        'DeltaMs':                      17.768, # in ps^{-1}
-        'GammaLb':			0.700, # in ps^{-1}
-        'GammaCombBkg':			1.057, # in ps^{-1}
-        'WeakPhase': {
-            'Bs2DsK':           70. / 180. * pi,
-            'Bs2DsstK':         70. / 180. * pi,
-            'Bs2DsKst':         70. / 180. * pi,
-            'Bs2DsstKst':	70. / 180. * pi,
-            'Bd2DPi':           70. / 180. * pi
-            },
-        'StrongPhase': {
-            'Bs2DsK':           30. / 180. * pi,
-            'Bs2DsstK':         -150. / 180. * pi,
-            'Bs2DsKst':         -150. / 180. * pi,
-            'Bs2DsstKst':       30. / 180. * pi,
-            'Bd2DPi':           30. / 180. * pi
-            },
-        'CombineModesForEffCPObs': [ ],
-        'Bs2DsKCPObs':                  'LambdaPhases',
-        'NEvents':			[ 33672. ],
-        'MassTemplateFile':             os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/WS_Mass_DsPi_5M_BDTGA.root',
-        'MassTemplateWorkspace':	'FitMeToolWS',
-        'MassInterpolation':		False,
-        'MistagTemplateFile':           os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/templates_BsDsPi.root',
-        'MistagTemplateWorkspace':	'workspace',
-        'MistagTemplateName':	        'MistagPdf_signal_BDTGA',
-        'DecayTimeResolutionModel':	'GaussianWithPEDTE',
-        'DecayTimeResolutionScaleFactor': 1.37,
-        'DecayTimeErrorTemplateFile':       os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/templates_BsDsPi.root',
-        'DecayTimeErrorTemplateWorkspace':  'workspace',
-        'DecayTimeErrorTemplateName':       'TimeErrorPdf_signal_BDTGA',
-        'DecayTimeErrorVarName':            'lab0_LifetimeFit_ctauErr',
-        'PowLawAcceptance_turnon':	1.3291e+00,
-        'PowLawAcceptance_offset':	1.6710e-02,
-        'PowLawAcceptance_expo':	1.8627e+00,
-        'PowLawAcceptance_beta':	3.4938e-02,
-        'AcceptanceCorrectionFile':     None,
-        'AcceptanceCorrectionHistName': None,
-        'NBinsAcceptance':              600,
-        'constParams': [
-            'Gammas', 'deltaGammas',
-            'Gammad', 'deltaGammad', 'deltaMd',
-            'mistag', 'timeerr_bias', 'timeerr_scalefactor',
-            'MistagCalibB_p0', 'MistagCalibB_p1', 'MistagCalibB_avgmistag',
-            'MistagCalibBbar_p0', 'MistagCalibBbar_p1', 'MistagCalibBbar_avgmistag',
-            'Bs2DsKst_TagEff', 'Bs2DsKst_delta', 'Bs2DsKst_lambda', 'Bs2DsKst_phi_w',
-            ],
-}
diff --git a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsPiDATA.py b/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsPiDATA.py
deleted file mode 100644
index 51a11251e199e6e28fdb685ad6bc72462648cd18..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/cFit/personality/2011PaperDsPiDATA.py
+++ /dev/null
@@ -1,292 +0,0 @@
-# personality for 2011 Paper - mode DsPi
-{
-        'IsToy':                False,
-        'DataFileName':         ('/afs/cern.ch/work/g/gligorov/public/Bs2DsKPlotsForPaper/NominalFit/WS_Mass_DsPi_5M_BDTGA.root' if haveAFS else
-	    os.environ['B2DXFITTERSROOT']+'/scripts/paperv3a-dsk-DATA/NominalFit/WS_Mass_DsPi_5M_BDTGA.root'),
-        'DataWorkSpaceName':    'FitMeToolWS',
-        'DataSetNames':         'combData',
-        'Modes': [
-            'Bs2DsPi',
-            'Bd2DPi', 'Bs2DsstPi',
-            'Bd2DsPi',
-            'Bs2DsK',
-            'Lb2LcPi',
-            'CombBkg'
-            ],
-        'SampleCategories': [
-            'nonres', 'phipi', 'kstk', 'kpipi', 'pipipi'
-            ],
-        'DeltaMs':                      17.768, # in ps^{-1}
-        'GammaLb':			0.676, # in ps^{-1}
-        'WeakPhase': {
-            'Bs2DsK':           70. / 180. * pi,
-            'Bs2DsstK':         70. / 180. * pi,
-            'Bs2DsKst':         70. / 180. * pi,
-            'Bs2DsstKst':	70. / 180. * pi,
-            'Bd2DPi':           70. / 180. * pi
-            },
-        'StrongPhase': {
-            'Bs2DsK':           30. / 180. * pi,
-            'Bs2DsstK':         -150. / 180. * pi,
-            'Bs2DsKst':         -150. / 180. * pi,
-            'Bs2DsstKst':       30. / 180. * pi,
-            'Bd2DPi':           30. / 180. * pi
-            },
-        'AcceptanceCorrectionFile': None,
-        'CombineModesForEffCPObs': [ ],
-        'Bs2DsKCPObs':                  'LambdaPhases',
-        'NEvents':			[ 33672. ],
-	'DataSetVarNameMapping': {
-	    'sample':   'sample',
-	    'mass':     'lab0_MassFitConsD_M',
-	    'pidk':     'lab1_PIDK',
-            'dsmass':   'lab2_MM',
-            'time':     'lab0_LifetimeFit_ctau',
-            'timeerr':  'lab0_LifetimeFit_ctauErr',
-            'mistag':   'tagOmegaComb',
-            'qf':       'lab1_ID',
-            'qt':       'tagDecComb',
-            'weight':   'nSig_both_nonres_Evts_sw+nSig_both_phipi_Evts_sw+nSig_both_kstk_Evts_sw+nSig_both_kpipi_Evts_sw+nSig_both_pipipi_Evts_sw'
-            },
-	'GammaCombBkg': [0.9944595961930113, 1.1013800661491908, 1.1831661712064796, 1.587632962259566],
-	'DGammaCombBkg': [1.0654394467936141, 0.9107177671397291, 1.421727928077652, 1.3131440797097205],
-        'CombBkg_D': [-0.8702277122156367, -0.8331423856820918, -0.9734197117683249, -0.8883029928866554],
-        'FitRanges': {
-		'time':     [0.4, 15.],
-		'timeerr':  [1e-6, 0.25],
-		'mistag':   [0., 0.5],
-		'mass':     [5320., 5420.],
-		'dsmass':   [1930., 2015.],
-		'pidk':     [0., 150.]
-		},
-        'MassTemplateFile':         ('/afs/cern.ch/work/g/gligorov/public/Bs2DsKPlotsForPaper/NominalFit/WS_Mass_DsPi_5M_BDTGA.root' if haveAFS else
-	    os.environ['B2DXFITTERSROOT']+'/scripts/paperv3a-dsk-DATA/NominalFit/WS_Mass_DsPi_5M_BDTGA.root'),
-        'MassTemplateWorkspace':	'FitMeToolWS',
-        'MassInterpolation':		False,
-        'NTaggers':                     3,
-        'TagEff':                    {
-            'Bs2DsPi': [ 0.3870 * (1. - 0.4772), 0.4772 * (1. - 0.3870), 0.3870 * 0.4772 ],
-            'Lb': [ 0.3870, 0.4772 ],
-            'Bd': [ 0.3870, 0.4772 ],
-            },
-        'MistagTemplates': {
-            'Bs2DsPi': [
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_3',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            'Bd2DPi': [
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BDPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BDPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_BDPi.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_3',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            'CombBkg': [
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_1',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_2',
-                    'VarName': 'tagOmegaComb', },
-                {   'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'sigMistagPdf_3',
-                    'VarName': 'tagOmegaComb', },
-                ],
-            },
-        'MistagCalibrationParams': {
-                'Bs2DsPi': [
-                    [ [ 0.376730, 1.048155, 0.371147 ], [ 0.365517, 0.950216, 0.371147 ] ],
-                    [ [ 0.404896, 0.995879, 0.414892 ], [ 0.424801, 1.004340, 0.414892 ] ],
-                    [ [ 0.338363, 1.027861, 0.338493 ], [ 0.338781, 0.971845, 0.338493 ] ],
-                    ],
-                'Bd': [
-                    [ [ 0.376730, 1.048155, 0.371147 ], [ 0.365517, 0.950216, 0.371147 ] ],
-                    [ [ 0.5, 0., 0. ], [ 0.5, 0., 0. ] ],
-                    [ [ 0.338363, 1.027861, 0.338493 ], [ 0.338781, 0.971845, 0.338493 ] ],
-                    ],
-                },
-        'Constraints': {
-                'GammaLb': 0.006,
-                'Bd2DPi_lambda': 0.3 * 0.0187,
-                'Bd2DPi_avgSSbar': [ '0.5*(@0+@1)', ['Bd2DPi_S', 'Bd2DPi_Sbar'], +0.046, 0.023 ],
-                'Bd2DPi_difSSbar': [ '0.5*(@0-@1)', ['Bd2DPi_S', 'Bd2DPi_Sbar'], -0.022, 0.021 ],
-                'Bd_AsymProd': 0.01,
-		'Bs_AsymProd': 0.01,
-		'Lb_AsymProd': 0.03,
-		'CombBkg_AsymProd': 0.03,
-		'Bs2DsK_AsymDet':	0.005,
-		'Bd2DPi_AsymDet':	0.01,
-		'Bd2DsPi_AsymDet':	0.01,
-		'Bs2DsPi_AsymDet':	0.01,
-		'Lb2LcPi_AsymDet':	0.03,
-		'CombBkg_AsymDet':	0.01,
-		'Bs2DsstPi_AsymDet':	0.01,
-                #'multivar_Bs2DsPiMistagCalib_p0p1': [
-                #    [   'Bs2DsPi_Mistag0CalibB_p0', 'Bs2DsPi_Mistag0CalibB_p1',
-                #        'Bs2DsPi_Mistag1CalibB_p0', 'Bs2DsPi_Mistag1CalibB_p1',
-                #        'Bs2DsPi_Mistag2CalibB_p0', 'Bs2DsPi_Mistag2CalibB_p1',
-                #        'Bs2DsPi_Mistag0CalibBbar_p0', 'Bs2DsPi_Mistag0CalibBbar_p1',
-                #        'Bs2DsPi_Mistag1CalibBbar_p0', 'Bs2DsPi_Mistag1CalibBbar_p1',
-                #        'Bs2DsPi_Mistag2CalibBbar_p0', 'Bs2DsPi_Mistag2CalibBbar_p1', ],
-                #    [   0.004389, 0.039917, 0.007146, 0.148797, 0.005959, 0.038725,
-                #        0.004395, 0.040072, 0.011414, 0.150355, 0.006030, 0.039962, ],
-                #    [   [  1.000000000, -0.111790756,  0.000000000,  0.000000000,  0.495659195, -0.121263673,  0.883403568, -0.090341177,  0.000000000,  0.000000000,  0.436308995, -0.115934567 ],
-                #        [ -0.111790756,  1.000000000,  0.000000000,  0.000000000, -0.170723691,  0.368653977, -0.090433543,  0.808300854,  0.000000000,  0.000000000, -0.138612127,  0.303210400 ],
-                #        [  0.000000000,  0.000000000,  1.000000000, -0.122610568,  0.658158523, -0.541239353,  0.000000000,  0.000000000,  0.938782519, -0.120298908,  0.633382320, -0.525375965 ],
-                #        [  0.000000000,  0.000000000, -0.122610568,  1.000000000, -0.631056425,  0.811985505,  0.000000000,  0.000000000, -0.122445304,  0.986409445, -0.608419498,  0.787887823 ],
-                #        [  0.495659195, -0.170723691,  0.658158523, -0.631056425,  1.000000000, -0.874463407,  0.436823522, -0.137898963,  0.622128000, -0.622176239,  0.940276558, -0.841479510 ],
-                #        [ -0.121263673,  0.368653977, -0.541239353,  0.811985505, -0.874463407,  1.000000000, -0.104272659,  0.297793832, -0.514032745,  0.800698231, -0.830102616,  0.950602614 ],
-                #        [  0.883403568, -0.090433543,  0.000000000,  0.000000000,  0.436823522, -0.104272659,  1.000000000, -0.111883376,  0.000000000,  0.000000000,  0.494752953, -0.134191009 ],
-                #        [ -0.090341177,  0.808300854,  0.000000000,  0.000000000, -0.137898963,  0.297793832, -0.111883376,  1.000000000,  0.000000000,  0.000000000, -0.170921923,  0.374807565 ],
-                #        [  0.000000000,  0.000000000,  0.938782519, -0.122445304,  0.622128000, -0.514032745,  0.000000000,  0.000000000,  1.000000000, -0.123454584,  0.672735926, -0.556618676 ],
-                #        [  0.000000000,  0.000000000, -0.120298908,  0.986409445, -0.622176239,  0.800698231,  0.000000000,  0.000000000, -0.123454584,  1.000000000, -0.616497607,  0.798523473 ],
-                #        [  0.436308995, -0.138612127,  0.633382320, -0.608419498,  0.940276558, -0.830102616,  0.494752953, -0.170921923,  0.672735926, -0.616497607,  1.000000000, -0.878334170 ],
-                #        [ -0.115934567,  0.303210400, -0.525375965,  0.787887823, -0.841479510,  0.950602614, -0.134191009,  0.374807565, -0.556618676,  0.798523473, -0.878334170,  1.000000000 ], ],
-                #    ],
-                'multivar_BdMistagCalib_p0p1': [
-                    [   'Bd_Mistag0CalibB_p0', 'Bd_Mistag0CalibB_p1',
-                        'Bd_Mistag2CalibB_p0', 'Bd_Mistag2CalibB_p1',
-                        'Bd_Mistag0CalibBbar_p0', 'Bd_Mistag0CalibBbar_p1',
-                        'Bd_Mistag2CalibBbar_p0', 'Bd_Mistag2CalibBbar_p1', ],
-                    [   0.004389, 0.039917, 0.005959, 0.038725,
-                        0.004395, 0.040072, 0.006030, 0.039962, ],
-                    [   [  1.000000000, -0.111790756,  0.495659195, -0.121263673,  0.883403568, -0.090341177,  0.436308995, -0.115934567 ],
-                        [ -0.111790756,  1.000000000, -0.170723691,  0.368653977, -0.090433543,  0.808300854, -0.138612127,  0.303210400 ],
-                        [  0.495659195, -0.170723691,  1.000000000, -0.874463407,  0.436823522, -0.137898963,  0.940276558, -0.841479510 ],
-                        [ -0.121263673,  0.368653977, -0.874463407,  1.000000000, -0.104272659,  0.297793832, -0.830102616,  0.950602614 ],
-                        [  0.883403568, -0.090433543,  0.436823522, -0.104272659,  1.000000000, -0.111883376,  0.494752953, -0.134191009 ],
-                        [ -0.090341177,  0.808300854, -0.137898963,  0.297793832, -0.111883376,  1.000000000, -0.170921923,  0.374807565 ],
-                        [  0.436308995, -0.138612127,  0.940276558, -0.830102616,  0.494752953, -0.170921923,  1.000000000, -0.878334170 ],
-                        [ -0.115934567,  0.303210400, -0.841479510,  0.950602614, -0.134191009,  0.374807565, -0.878334170,  1.000000000 ], ],
-                    ],
-                'multivar_Bs2DsKTagEffAsyms': [
-                        [   'Bs2DsK_TagEff0', 'Bs2DsK_TagEff1', 'Bs2DsK_TagEff2',
-                            'Bs2DsK_AsymTagEff0', 'Bs2DsK_AsymTagEff1', 'Bs2DsK_AsymTagEff2' ],
-                        [   0.001952, 0.002330, 0.001843, 0.001628, 0.001029, 0.001629 ],
-                        [   [   1.0000000000000000e+00,  -9.6310597862753633e-01,   2.4948159233783404e-01,   1.0144953478135443e-02,   7.0203224420703663e-03,   1.0233976427853671e-02 ],
-                            [  -9.6310597862753633e-01,   1.0000000000000000e+00,   2.0335415458912924e-02,  -8.0556554583657968e-03,  -5.7778847902391142e-03,  -8.1729979402554217e-03 ],
-                            [   2.4948159233783404e-01,   2.0335415458912924e-02,   1.0000000000000000e+00,   8.9803482925014111e-03,   5.0106145332872738e-03,   8.8849526862593686e-03 ],
-                            [   1.0144953478135443e-02,  -8.0556554583657968e-03,   8.9803482925014111e-03,   1.0000000000000000e+00,  -9.9965299841531974e-01,   9.9878828433569355e-01 ],
-                            [   7.0203224420703663e-03,  -5.7778847902391142e-03,   5.0106145332872738e-03,  -9.9965299841531974e-01,   1.0000000000000000e+00,  -9.9759036187377381e-01 ],
-                            [   1.0233976427853671e-02,  -8.1729979402554217e-03,   8.8849526862593686e-03,   9.9878828433569355e-01,  -9.9759036187377381e-01,   1.0000000000000000e+00 ], ],
-                    ],
-                #'multivar_Bs2DsPiTagEffAsyms': [
-                #        [   'Bs2DsPi_TagEff0', 'Bs2DsPi_TagEff1', 'Bs2DsPi_TagEff2',
-                #            'Bs2DsPi_AsymTagEff0', 'Bs2DsPi_AsymTagEff1', 'Bs2DsPi_AsymTagEff2' ],
-                #        [   0.001952, 0.002330, 0.001843, 0.001628, 0.001029, 0.001629 ],
-                #        [   [   1.0000000000000000e+00,  -9.6310597862753633e-01,   2.4948159233783404e-01,   1.0144953478135443e-02,   7.0203224420703663e-03,   1.0233976427853671e-02 ],
-                #            [  -9.6310597862753633e-01,   1.0000000000000000e+00,   2.0335415458912924e-02,  -8.0556554583657968e-03,  -5.7778847902391142e-03,  -8.1729979402554217e-03 ],
-                #            [   2.4948159233783404e-01,   2.0335415458912924e-02,   1.0000000000000000e+00,   8.9803482925014111e-03,   5.0106145332872738e-03,   8.8849526862593686e-03 ],
-                #            [   1.0144953478135443e-02,  -8.0556554583657968e-03,   8.9803482925014111e-03,   1.0000000000000000e+00,  -9.9965299841531974e-01,   9.9878828433569355e-01 ],
-                #            [   7.0203224420703663e-03,  -5.7778847902391142e-03,   5.0106145332872738e-03,  -9.9965299841531974e-01,   1.0000000000000000e+00,  -9.9759036187377381e-01 ],
-                #            [   1.0233976427853671e-02,  -8.1729979402554217e-03,   8.8849526862593686e-03,   9.9878828433569355e-01,  -9.9759036187377381e-01,   1.0000000000000000e+00 ], ],
-                #    ],
-                },
-        'Asymmetries': {
-                'Prod': {
-		    'Bs': -0.014,
-		    'Bd': 0.011,
-		    'Lb': 0.03,
-		    'CombBkg': -0.01,
-		    },
-		'Det': {
-		        'Bs2DsK':	0.01,
-			'Bd2DPi':	0.005,
-			'Bd2DsPi':	0.01,
-			'Bs2DsPi':	0.005,
-			'Lb2LcPi':	0.005,
-			'CombBkg':	0.01,
-			'Bs2DsstPi':	0.005,
-		    },
-                'TagEff': {
-                        'Bs2DsK':   [ -0.002756, 0.001837, -0.002315 ],
-                        'Bs2DsPi':  [ -0.002756, 0.001837, -0.002315 ],
-                    },
-                'TagEff_t': {}, 'TagEff_f': {},
-                },
-        'DecayTimeResolutionModel':	'GaussianWithPEDTE',
-        'DecayTimeResolutionScaleFactor': 1.37,
-        'DecayTimeErrorTemplates': {
-                'Bs2DsK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsK',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bs2DsPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bs2DsstPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bs2DsstPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Lb2LcPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Lb2LcPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'Bd2DPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_Bd2DPi',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                'CombBkg': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'TimeErrorPdf_CombBkg',
-                    'VarName': 'lab0_LifetimeFit_ctauErr', },
-                },
-        'KFactorTemplates': {
-                'Bs2DsK': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsPi_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bs2DsK_both',
-                    'VarName': 'kfactorVar', },
-                'Bs2DsstPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsPi_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bs2DsstPi_both',
-                    'VarName': 'kfactorVar', },
-                'Lb2LcPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsPi_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Lb2LcPi_both',
-                    'VarName': 'kfactorVar', },
-                'Bd2DPi': {
-                    'File': os.environ['B2DXFITTERSROOT']+'/data/workspace/MDFitter/template_MC_KFactor_BsDsPi_5320_5420.root',
-                    'Workspace': 'workspace',
-                    'TemplateName': 'kFactor_Bd2DPi_both',
-                    'VarName': 'kfactorVar', },
-                },
-        'AcceptanceFunction': 'Spline',
-        'constParams': [
-            'Gammas', 'deltaGammas',
-            'Gammad', 'deltaGammad', 'deltaMd',
-            'mistag', 'timeerr_bias', 'timeerr_scalefactor',
-            '.+_Mistag[0-9]+Calib(B|Bbar)_p[0-9]+',
-            'Bs2DsKst_TagEff[0-9]', 'Bs2DsKst_delta', 'Bs2DsKst_lambda', 'Bs2DsKst_phi_w',
-	    '.+Asym.+',
-            ],
-}
diff --git a/PhysFit/B2DXFitters/data/cFit/toysettings/2011PAPER.tar.bz2 b/PhysFit/B2DXFitters/data/cFit/toysettings/2011PAPER.tar.bz2
deleted file mode 100644
index 6bab494f77d97f1eb5ca8d8fddc3b7d73e9b4539..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/cFit/toysettings/2011PAPER.tar.bz2 and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/config_B2DPi.txt b/PhysFit/B2DXFitters/data/config_B2DPi.txt
deleted file mode 100644
index 3d34abd1b52f7725954d91ef910bf8aced020e7a..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/config_B2DPi.txt
+++ /dev/null
@@ -1,190 +0,0 @@
-#BdDPi BsHypo
-/afs/cern.ch/work/a/adudziak/public/
-Merged_Bd2DPi_D2KPiPi_MD_BsHypo_BDTG.root
-Merged_Bd2DPi_D2KPiPi_MU_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#BdPi
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bd2DPi_KPiPi_MD_OFFLINE.root
-MergedTree_Bd2DPi_KPiPi_MU_OFFLINE.root
-DecayTree
-DecayTree
-###
-
-#BdDPi BdHypo
-/afs/cern.ch/work/a/adudziak/public/
-Merged_Bd2DPi_D2KPiPi_MD_BdHypo_BDTG.root
-Merged_Bd2DPi_D2KPiPi_MU_BdHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#BDK
-/afs/cern.ch/work/a/adudziak/public/
-Merged_Bd2DK_D2KPiPi_MD_BdHypo_BDTG.root
-Merged_Bd2DK_D2KPiPi_MU_BdHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-	
-
-#LbLcPi
-/afs/cern.ch/work/a/adudziak/public/
-Merged_Lb2LcPi_Lc2pKPi_MD_BsHypo_BDTG.root
-Merged_Lb2LcPi_Lc2pKPi_MU_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#LbLcPi data
-/castor/cern.ch/user/r/rkoopman/dataLbLcPi/BDT/
-Lb2LcPi_Strip17_MD_Merged_BDTG.root
-Lb2LcPi_Strip17_MU_Merged_BDTG.root
-DecayTree
-DecayTree
-###
-
-#LbDsp
-/afs/cern.ch/work/a/adudziak/public/
-Merged_Lb2Dsp_Ds2KKPi_MD_BsHypo_BDTG.root
-Merged_Lb2Dsp_Ds2KKPi_MU_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#LbDsstp
-/afs/cern.ch/work/a/adudziak/public/
-Merged_Lb2Dsstp_Ds2KKPi_MD_BsHypo_BDTG.root
-Merged_Lb2Dsstp_Ds2KKPi_MU_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#BsDsPi
-/afs/cern.ch/work/a/adudziak/public/
-Merged_Bs2DsPi_Ds2KKPi_MD_BsHypo_BDTG.root
-Merged_Bs2DsPi_Ds2KKPi_MU_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#BsDsK
-/afs/cern.ch/work/a/adudziak/public/
-Merged_Bs2DsK_Ds2KKPi_MD_BsHypo_BDTG.root
-Merged_Bs2DsK_Ds2KKPi_MU_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#MC FileName MD
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DK_D2KPiPi_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsPi_Ds2KKPi_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DRho_D2KPiPi_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DstPi_Dst2D-Pi0_BdHypo_BDTG.root
-###
-
-#MC FileName MU
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DK_D2KPiPi_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsPi_Ds2KKPi_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DRho_D2KPiPi_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DstPi_Dst2D-Pi0_BdHypo_BDTG.root
-###
-
-#MC TreeName
-DecayTree;1
-DecayTree;1
-DecayTree;1
-DecayTree;1
-DecayTree;1
-###
-
-
-#MC FileName MD old
-/afs/cern.ch/work/a/adudziak/public/Merged_Bd2DK_D2KPiPi_MD_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/Merged_Bs2DsPi_Ds2KKPi_MD_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/Merged_Lb2LcPi_Lc2pKPi_MD_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/Merged_Bd2DRho_D2KPiPi_MD_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/Merged_Bd2DstPi_Dst2D-Pi0_MD_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/Merged_Bd2DKst_D2KPiPi_MD_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/Merged_Bd2DstK_Dst2D-Pi0_MD_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/Merged_Bs2DsRho_Ds2KKPi_MD_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/Merged_Bs2DsstPi_Ds2KKPi_MD_BdHypo_BDTG.root
-###
-
-#MC FileName MU old
-/afs/cern.ch/work/a/adudziak/public/Merged_Bd2DK_D2KPiPi_MU_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/Merged_Bs2DsPi_Ds2KKPi_MU_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/Merged_Lb2LcPi_Lc2pKPi_MU_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/Merged_Bd2DRho_D2KPiPi_MU_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/Merged_Bd2DstPi_Dst2D-Pi0_MU_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/Merged_Bd2DKst_D2KPiPi_MU_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/Merged_Bd2DstK_Dst2D-Pi0_MU_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/Merged_Bs2DsRho_Ds2KKPi_MU_BdHypo_BDTG.root
-/afs/cern.ch/work/a/adudziak/public/Merged_Bs2DsstPi_Ds2KKPi_MU_BdHypo_BDTG.root
-###
-
-#MC TreeName old
-DecayTree;1
-DecayTree;1
-DecayTree;1
-DecayTree;1
-DecayTree;1
-DecayTree;1
-DecayTree;1
-DecayTree;1
-DecayTree;1
-###
-
-#PIDp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_TightCuts.root
-EffHistos_Reco12_39Mom_Proton_MagUp_TightCuts.root
-###
-
-#PID3
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PID
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PID2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_45678.root
-EffHistos_Reco12_39Mom_MagUp_3456.root
-###
-
-
-#PID Dsp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_DLLpDLLpK.root
-EffHistos_Reco12_39Mom_Proton_MagDown_DLLpDLLpK.root
-###
-
-#PIDp2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_36Mom_Proton_MagDown_DLL.root
-EffHistos_Reco12_36Mom_Proton_MagUp_DLL.root
-###
-
-#RatioDataMC2D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-MomVsnTr_Comp_DPi_Down_hist.root
-MomVsnTr_Comp_DPi_Up_hist.root
-###
-
-#RatioDataMC3D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-PtVsnTrVsP_Comp_DPi_Down_hist.root
-PtVsnTrVsP_Comp_DPi_Up_hist.root
-###
diff --git a/PhysFit/B2DXFitters/data/config_Bs2Dsh2011TDAna_Bs2DsK.txt b/PhysFit/B2DXFitters/data/config_Bs2Dsh2011TDAna_Bs2DsK.txt
deleted file mode 100644
index 90530f755269397a0c45e0b6e68123e0bb308958..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/config_Bs2Dsh2011TDAna_Bs2DsK.txt
+++ /dev/null
@@ -1,294 +0,0 @@
-#Bs2DsK NonRes 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsK_NonRes.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsK_NonRes.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK PhiPi 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsK_PhiPi.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsK_PhiPi.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK KstK 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsK_KstK.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsK_KstK.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK KPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsK_KPiPi.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsK_KPiPi.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsK PiPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsK_PiPiPi.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsK_PiPiPi.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_KPiPi.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_KPiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-#Bs2DsPi KstK 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_KstK.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_KstK.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi NonRes 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_NonRes.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_NonRes.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PhiPi 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_PhiPi.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_PhiPi.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PiPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_PiPiPi.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_PiPiPi.root
-DecayTree
-DecayTree
-###
-
-#sWeights
-/afs/cern.ch/work/a/adudziak/public/sWeights/
-sWeights_BsDsK_all_both.root
-sWeights_BsDsK_all_both.root
-merged
-merged
-###
-
-
-#PIDp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_TightCuts.root
-EffHistos_Reco12_39Mom_Proton_MagUp_TightCuts.root
-###
-
-#PID
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PID2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_45678.root
-EffHistos_Reco12_39Mom_MagUp_3456.root
-###
-
-#RatioDataMC2D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-MomVsnTr_Comp_DPi_Down_hist.root
-MomVsnTr_Comp_DPi_Up_hist.root
-###
-
-#MC FileName KKPi MD 2011
-{"Mode":"Bd2DK",     
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DK_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"} 
-{"Mode":"Bs2DsRho",  
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsRho_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstK",  
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi", 
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",    
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",  
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsstp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",    
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcK_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",   
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",    
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MU 2011
-{"Mode":"Bd2DK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DK_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsRho_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsstp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcK_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-#Kfactor MC FileName MD
-{"Mode":"Bd2DK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DK_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsRho_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsstp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcK_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-#Kfactor MC FileName MU
-{"Mode":"Bd2DK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DK_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsRho_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsp",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2Dsstp",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2Dsstp_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcK_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-
-#Signal Bs2DsK KstK 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_OFFLINE_DsK_KstK.root
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_OFFLINE_DsK_KstK.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal Bs2DsK PhiPi 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_OFFLINE_DsK_PhiPi.root
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_OFFLINE_DsK_PhiPi.root
-DecayTree;1
-DecayTree;1
-###
- 
-#Signal Bs2DsK NonRes 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_OFFLINE_DsK_NonRes.root
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_OFFLINE_DsK_NonRes.root
-DecayTree;1
-DecayTree;1
-###
-
-
-#Signal Bs2DsK KPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsK_Ds2KPiPi_BsHypo_OFFLINE_DsK_KPiPi.root
-MergedTree_Bs2DsK_Ds2KPiPi_BsHypo_OFFLINE_DsK_KPiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal Bs2DsK PiPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsK_Ds2PiPiPi_BsHypo_OFFLINE_DsK_PiPiPi.root
-MergedTree_Bs2DsK_Ds2PiPiPi_BsHypo_OFFLINE_DsK_PiPiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-
-#PID2m2
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_0123.root
-EffHistos_Reco12_39Mom_MagUp_2m2_012.root
-###
-
-#PID2m22
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_45678.root
-EffHistos_Reco12_39Mom_MagUp_2m2_3456.root
-###
-
-#PIDp3
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_Proton_DLLKDLLpK.root
-EffHistos_Reco12_39Mom_MagUp_Proton_DLLKDLLpK.root
-###
-
diff --git a/PhysFit/B2DXFitters/data/config_Bs2Dsh2011TDAna_Bs2DsPi.txt b/PhysFit/B2DXFitters/data/config_Bs2Dsh2011TDAna_Bs2DsPi.txt
deleted file mode 100644
index bb9a9e28958316bc22303eda68baf24934d2d26b..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/config_Bs2Dsh2011TDAna_Bs2DsPi.txt
+++ /dev/null
@@ -1,257 +0,0 @@
-#B2DPi KPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bd2DPi_KPiPi_MD_OFFLINE.root
-MergedTree_Bd2DPi_KPiPi_MU_OFFLINE.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_KPiPi.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_KPiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-#Bs2DsPi KstK 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_KstK.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_KstK.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi NonRes 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_NonRes.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_NonRes.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PhiPi 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_PhiPi.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_PhiPi.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PiPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_PiPiPi.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_PiPiPi.root
-DecayTree
-DecayTree
-###
-
-#sWeights
-/afs/cern.ch/work/a/adudziak/public/sWeights/
-sWeights_BsDsPi_all_both.root
-sWeights_BsDsPi_all_both.root
-merged
-merged
-###
-
-
-#PIDp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_TightCuts.root
-EffHistos_Reco12_39Mom_Proton_MagUp_TightCuts.root
-###
-
-#PID
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PID2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_45678.root
-EffHistos_Reco12_39Mom_MagUp_3456.root
-###
-
-#RatioDataMC2D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-MomVsnTr_Comp_DPi_Down_hist.root
-MomVsnTr_Comp_DPi_Up_hist.root
-###
-
-#RatioDataMC3D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-PtVsnTrVsP_Comp_DPi_Down_hist.root
-PtVsnTrVsP_Comp_DPi_Up_hist.root
-###
-
-#MC FileName KKPi MD 2011
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsRho_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MU 2011
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsRho_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-#Kfactor MC FileName MD
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-#Kfactor MC FileName MU
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-
-#Signal Bs2DsPi HHHPi0 2011
-rfio:/castor/cern.ch/user/s/sgallori/lhcb/bs2dsk/13_01_2014/
-MergedTree_Signal_Bs2DsPi_Ds2HHHPi0Resolved_dw.root
-MergedTree_Signal_Bs2DsPi_Ds2HHHPi0Resolved_up.root
-DecayTreeTuple/tuple
-DecayTreeTuple/tuple
-###
-
-#Signal Bs2DsPi KstK 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_KstK.root
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_KstK.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal Bs2DsPi PhiPi 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_PhiPi.root
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_PhiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal Bs2DsPi NonRes 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_NonRes.root
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_NonRes.root
-DecayTree;1
-DecayTree;1
-###
-
-
-#Signal Bs2DsPi KPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2KPiPi_BsHypo_OFFLINE_DsPi_KPiPi.root
-MergedTree_Bs2DsPi_Ds2KPiPi_BsHypo_OFFLINE_DsPi_KPiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal Bs2DsPi PiPiPi 2011
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2PiPiPi_BsHypo_OFFLINE_DsPi_PiPiPi.root
-MergedTree_Bs2DsPi_Ds2PiPiPi_BsHypo_OFFLINE_DsPi_PiPiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-
-
-#DPi misID lab5
-MyKaonEff_5
-MyKaonEff_m2
-MyKaonEff_m2
-MyKaonMisID_5
-MyKaonMisID_5
-###
-
-#DPi misID lab34 1
-MyKaonMisID_10
-MyKaonMisID_10
-MyKaonMisID_10
-MyKaonMisID_10
-MyKaonMisID_10
-###
-
-#DPi misID lab34 2
-MyKaonMisID_10_pKm5
-MyKaonMisID_10_pKm5
-MyKaonMisID_10_pKm5
-MyKaonMisID_10
-MyKaonMisID_10
-###
-
-#LcPi misID lab5
-MyProtonMisID_5_pK5;1
-MyProtonMisID_m2_pK5;1
-MyProtonMisID_5_pK5;1
-MyProtonMisID_10_pK5;1
-MyProtonMisID_5_p5;1
-###
-
-#LcPi misID lab4
-###
-
-#PID2m2
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_0123.root
-EffHistos_Reco12_39Mom_MagUp_2m2_012.root
-###
-
-#PID2m22
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_45678.root
-EffHistos_Reco12_39Mom_MagUp_2m2_3456.root
-###
-
-#PIDp3
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_Proton_DLLKDLLpK.root
-EffHistos_Reco12_39Mom_MagUp_Proton_DLLKDLLpK.root
-###
diff --git a/PhysFit/B2DXFitters/data/config_Bs2DsstPi.txt b/PhysFit/B2DXFitters/data/config_Bs2DsstPi.txt
deleted file mode 100644
index 31f312a1974fda25e870c0e3b72775cb78f3d8fc..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/config_Bs2DsstPi.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-#Bs2DsstPi KKPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt_dev/
-Filter11_Bs2DsstPi_Data_dw.root
-Filter11_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi KKPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter12-s21_Bs2DsstPi_Data_dw.root
-Filter12-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi KKPi
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt_dev/
-Filter_Bs2DsstPi_Data_dw.root
-Filter_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-	
-#MC FileName KKPi MD 2012
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bs2Dsrho_dw.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bs2Dsstrho_dw.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
-###
-
-#MC FileName KKPi MU 2012
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bs2Dsrho_up.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/Filter-s21_Bs2DsstPi_Bs2Dsstrho_up.root",
- "TreeName":"tuple;1",
- "Smooth":2.5}
-###
-
-#Signal Bs2DsstPi KKPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter-s21_Bs2DsstPi_Signal_dw.root
-Filter-s21_Bs2DsstPi_Signal_up.root
-tuple
-tuple
-###
-
-
-#Bs2DsstPi Combinatorial KKPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt_dev/
-Filter11_Bs2DsstPi_Data_dw.root
-Filter11_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial KKPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt-s21/
-Filter12-s21_Bs2DsstPi_Data_dw.root
-Filter12-s21_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
diff --git a/PhysFit/B2DXFitters/data/config_Bs2DsstPi_old.txt b/PhysFit/B2DXFitters/data/config_Bs2DsstPi_old.txt
deleted file mode 100644
index dccb197fcbf7d0c2fae1aa6db3c62d80c2f0b59f..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/config_Bs2DsstPi_old.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-#Bs2DsstPi KKPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt_dev/
-Filter11_Bs2DsstPi_Data_dw.root
-Filter11_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi KKPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt_dev/
-Filter12_Bs2DsstPi_Data_dw.root
-Filter12_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi KKPi
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt_dev/
-Filter_Bs2DsstPi_Data_dw.root
-Filter_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-	
-#MC FileName KKPi MD 2011
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt_dev/Filter_Bs2DsstPi_Bs2Dsrho_dw.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt_dev/Filter_Bs2DsstPi_Bs2Dsstrho_dw.root",
- "TreeName":"tuple;1",
- "Smooth":3.5}
-###
-
-#MC FileName KKPi MD 2012
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt_dev/Filter_Bs2DsstPi_Bs2Dsrho_dw.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt_dev/Filter_Bs2DsstPi_Bs2Dsstrho_dw.root",
- "TreeName":"tuple;1",
- "Smooth":3.5}
-###
-
-
-#MC FileName KKPi MU 2011
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt_dev/Filter_Bs2DsstPi_Bs2Dsrho_up.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt_dev/Filter_Bs2DsstPi_Bs2Dsstrho_up.root",
- "TreeName":"tuple;1",
- "Smooth":3.5}
-###
-
-#MC FileName KKPi MU 2012
-{"Mode":"Bs2DsRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt_dev/Filter_Bs2DsstPi_Bs2Dsrho_up.root",
- "TreeName":"tuple;1"}
-{"Mode":"Bs2DsstRho",
- "FileName":"/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt_dev/Filter_Bs2DsstPi_Bs2Dsstrho_up.root",
- "TreeName":"tuple;1",
- "Smooth":3.5}
-###
-
-
-#Signal BsDsstPi KKPi
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt_dev/
-Filter_Bs2DsstPi_Signal_dw.root
-Filter_Bs2DsstPi_Signal_up.root
-tuple
-tuple
-###
-
-#weight
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt_dev/
-weight-combo_dw.root 
-weight-combo_up.root
-###
-
-#Bs2DsstPi Combinatorial KKPi 2011
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt_dev/
-Filter11_Bs2DsstPi_Data_dw.root
-Filter11_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
-
-#Bs2DsstPi Combinatorial KKPi 2012
-/afs/cern.ch/work/a/abertoli/public/DsstrPi/bdt_dev/
-Filter12_Bs2DsstPi_Data_dw.root
-Filter12_Bs2DsstPi_Data_up.root
-tuple
-tuple
-###
diff --git a/PhysFit/B2DXFitters/data/config_ExpectedEvents.txt b/PhysFit/B2DXFitters/data/config_ExpectedEvents.txt
deleted file mode 100644
index 3dde1170e0256a85858b16dab8a4b77cd28d3b22..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/config_ExpectedEvents.txt
+++ /dev/null
@@ -1,271 +0,0 @@
-#BdDPi BsHypo NonRes
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root
-MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-
-#BdDPi BsHypo KstK
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root
-MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-
-#BdDPi BsHypo PhiPi
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root
-MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#BdDPi BsHypo KPiPi
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root
-MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#BdDPi BdHypo
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bd2DPi_D2KPiPi_BdHypo_BDTG.root
-MergedTree_Bd2DPi_D2KPiPi_BdHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-
-#BDK
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bd2DK_D2KPiPi_BdHypo_BDTG.root
-MergedTree_Bd2DK_D2KPiPi_BdHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-	
-
-#LbLcPi PhiPi
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root
-MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#LbLcPi KstK
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root
-MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#LbLcPi NonRes
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root
-MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#LbLcPi KPiPi
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root
-MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#LbLcPi PiPiPi
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root
-MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#LbLcPi data
-/castor/cern.ch/user/r/rkoopman/dataLbLcPi/BDT/
-Lb2LcPi_Strip17_MD_Merged_BDTG.root
-Lb2LcPi_Strip17_MU_Merged_BDTG.root
-DecayTree
-DecayTree
-###
-
-#LbDsp
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-Merged_Lb2Dsp_Ds2KKPi_MD_BsHypo_BDTG.root
-Merged_Lb2Dsp_Ds2KKPi_MU_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#LbDsstp
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-Merged_Lb2Dsstp_Ds2KKPi_MD_BsHypo_BDTG.root
-Merged_Lb2Dsstp_Ds2KKPi_MU_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#BsDsPi old
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-Merged_Bs2DsPi_Ds2KKPi_MD_BsHypo_BDTG.root
-Merged_Bs2DsPi_Ds2KKPi_MU_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#BsDsPi NonRes
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_BDTG.root
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#BsDsPi PhiPi
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_BDTG.root
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#BsDsPi KstK
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_BDTG.root
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#BsDsPi KPiPi
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_BDTG.root
-MergedTree_Bs2DsPi_Ds2KPiPi_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#BsDsPi PiPiPi
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2PiPiPi_BsHypo_BDTG.root
-MergedTree_Bs2DsPi_Ds2PiPiPi_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-
-#BsDsK NonRes
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#BsDsK PhiPi
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#BsDsK KstK
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#BsDsK KPiPi
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root
-MergedTree_Bs2DsK_Ds2KPiPi_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#BsDsK PiPiPi
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsK_Ds2PiPiPi_BsHypo_BDTG.root
-MergedTree_Bs2DsK_Ds2PiPiPi_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#PIDp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_TightCuts.root
-EffHistos_Reco12_39Mom_Proton_MagUp_TightCuts.root
-###
-
-#PID3
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PID
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PID2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_45678.root
-EffHistos_Reco12_39Mom_MagUp_3456.root
-###
-
-
-#PID Dsp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_DLLpDLLpK.root
-EffHistos_Reco12_39Mom_Proton_MagDown_DLLpDLLpK.root
-###
-
-#PIDp2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_36Mom_Proton_MagDown_DLL.root
-EffHistos_Reco12_36Mom_Proton_MagUp_DLL.root
-###
-
-#PID2m2
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_0123.root
-EffHistos_Reco12_39Mom_MagUp_2m2_012.root
-###
-
-#PID2m22
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_45678.root
-EffHistos_Reco12_39Mom_MagUp_2m2_3456.root
-###
-		
-#PIDp3
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_Proton_DLLKDLLpK.root
-EffHistos_Reco12_39Mom_MagUp_Proton_DLLKDLLpK.root
-###
-
-#RatioDataMC2D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-MomVsnTr_Comp_DPi_Down_hist.root
-MomVsnTr_Comp_DPi_Up_hist.root
-###
-
-#RatioDataMC3D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-PtVsnTrVsP_Comp_DPi_Down_hist.root
-PtVsnTrVsP_Comp_DPi_Up_hist.root
-###
diff --git a/PhysFit/B2DXFitters/data/config_LbLcPi.txt b/PhysFit/B2DXFitters/data/config_LbLcPi.txt
deleted file mode 100644
index e7e6a0d7b91c8f06649ed3200827d30477efb3c7..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/config_LbLcPi.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-#LbLcPi KKPi NonRes
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_LcPiHypo_NonRes.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_LcPiHypo_NonRes.root
-DecayTree
-DecayTree
-###
-
-#LbLcPi KKPi PhiPi
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_LcPiHypo_PhiPi.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_LcPiHypo_PhiPi.root
-DecayTree
-DecayTree
-###
-
-#LbLcPi KKPi KstK
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_LcPiHypo_KstK.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_LcPiHypo_KstK.root
-DecayTree
-DecayTree
-###
-
-
-#LbLcPi KPiPi
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi_LcPiHypo_KPiPi.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi_LcPiHypo_KPiPi.root
-DecayTree
-DecayTree
-###
diff --git a/PhysFit/B2DXFitters/data/config_compareMDmeas_example.py b/PhysFit/B2DXFitters/data/config_compareMDmeas_example.py
deleted file mode 100644
index fd5058a2102742f70d5c70ab08089318178c52b7..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/config_compareMDmeas_example.py
+++ /dev/null
@@ -1,34 +0,0 @@
-def getconfig():
-
-    configdict = {}
-
-    configdict["Inputs"] = {}
-    configdict["Inputs"] = {
-        "First":
-        {
-        "Values":      [0.32, 0.34, 0.57],
-        "Errors":      [0.03, 0.04, 0.05],
-        "Correlation": [ [1, 0.015, -0.003],
-                         [1, 0.04],
-                         [1] ]
-        },
-        "Second":
-        {
-        "Values":      [0.3, 0.4, 0.5],
-        "Errors":      [0.01, 0.01, 0.01],
-        "Correlation": [ [1, 0.001, -0.001],
-                         [1, 0.01],
-                         [1] ]
-        }
-        }
-    
-    configdict["Parameters"] = {}
-    configdict["Parameters"] = ["A", "B", "C"]
-    
-    #Temporary workaround (leave as it is, not important)
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range"                  : [5090,    6000    ],
-                                                      "Name"                   : "BeautyMass",
-                                                      "InputName"              : "lab0_FitDaughtersConst_M_flat"}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/config_fitCombBkg.txt b/PhysFit/B2DXFitters/data/config_fitCombBkg.txt
deleted file mode 100644
index 9e4911cffcee41700d7822892385902fd012629e..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/config_fitCombBkg.txt
+++ /dev/null
@@ -1,149 +0,0 @@
-#BDPi KPiPi old
-/afs/cern.ch/work/g/gligorov/public/Bs2DsKFitTuples/DV_v33r1/SmallTuples/
-DPi_KPiPi_MD_BDTG_MINI.root
-DPi_KPiPi_MU_BDTG_MINI.root
-DecayTree
-DecayTree
-###
-
-#BDPi KPiPi
-/afs/cern.ch/work/g/gligorov/public/Bs2DsKFitTuples/DV_v33r1/SmallTuples/
-DPi_KPiPi_MD_BDTG_NoVetos_MINI.root
-DPi_KPiPi_MU_BDTG_NoVetos_MINI.root
-DecayTree
-DecayTree
-###
-
-
-#BDPi KPiPi WS
-/afs/cern.ch/work/g/gligorov/public/Bs2DsKFitTuples/DV_v33r1/SmallTuples/
-DPi_KPiPi_WS_MD_BDTG_MINI.root
-DPi_KPiPi_WS_MU_BDTG_MINI.root
-DecayTree
-DecayTree
-###
-
-
-#BsDsPi KKPi All
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsPi.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsPi.root
-DecayTree
-DecayTree
-###
-
-#BsDsPi KKPi NonRes
-/afs/cern.ch/work/g/gligorov/public/Bs2DsKFitTuples/DV_v33r1/SmallTuples/
-DsPi_KKPi_NonRes_MD_BDTG_MINI.root
-DsPi_KKPi_NonRes_MU_BDTG_MINI.root
-DecayTree
-DecayTree
-###
-
-#BsDsPi KKPi PhiPi
-/afs/cern.ch/work/g/gligorov/public/Bs2DsKFitTuples/DV_v33r1/SmallTuples/
-DsPi_KKPi_PhiPi_MD_BDTG_MINI.root
-DsPi_KKPi_PhiPi_MU_BDTG_MINI.root
-DecayTree
-DecayTree
-###
-
-#BsDsPi KKPi KstK
-/afs/cern.ch/work/g/gligorov/public/Bs2DsKFitTuples/DV_v33r1/SmallTuples/
-DsPi_KKPi_KstK_MD_BDTG_MINI.root
-DsPi_KKPi_KstK_MU_BDTG_MINI.root
-DecayTree
-DecayTree
-###
-
-
-#BsDsPi KPiPi
-/afs/cern.ch/work/g/gligorov/public/Bs2DsKFitTuples/DV_v33r1/SmallTuples/
-DsPi_KPiPi_MD_BDTG_MINI.root
-DsPi_KPiPi_MU_BDTG_MINI.root
-DecayTree
-DecayTree
-###
-
-#BsDsPi PiPiPi
-/afs/cern.ch/work/g/gligorov/public/Bs2DsKFitTuples/DV_v33r1/SmallTuples/
-DsPi_PiPiPi_MD_BDTG_MINI.root
-DsPi_PiPiPi_MU_BDTG_MINI.root
-DecayTree
-DecayTree
-###
-
-#BsDsK All
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-DsK_All_MD_BDTG_MINI.root
-DsK_All_MU_BDTG_MINI.root
-DecayTree
-DecayTree
-###
-
-
-#BsDsK KKPi All
-/afs/cern.ch/work/a/adudziak/public/Bs2DsKFitTuple/
-MergedTree_Bs2DsX_MD_OFFLINE_DsK.root
-MergedTree_Bs2DsX_MU_OFFLINE_DsK.root
-DecayTree
-DecayTree
-###
-
-#BsDsK KKPi NonRes
-/afs/cern.ch/work/g/gligorov/public/Bs2DsKFitTuples/DV_v33r1/SmallTuples/
-DsK_KKPi_NonRes_MD_BDTG_MINI.root
-DsK_KKPi_NonRes_MU_BDTG_MINI.root
-DecayTree
-DecayTree
-###
-
-#BsDsK KKPi PhiPi
-/afs/cern.ch/work/g/gligorov/public/Bs2DsKFitTuples/DV_v33r1/SmallTuples/
-DsK_KKPi_PhiPi_MD_BDTG_MINI.root
-DsK_KKPi_PhiPi_MU_BDTG_MINI.root
-DecayTree
-DecayTree
-###
-
-#BsDsK KKPi KstK
-/afs/cern.ch/work/g/gligorov/public/Bs2DsKFitTuples/DV_v33r1/SmallTuples/
-DsK_KKPi_KstK_MD_BDTG_MINI.root
-DsK_KKPi_KstK_MU_BDTG_MINI.root
-DecayTree
-DecayTree
-###
-
-#BsDsK KPiPi
-/afs/cern.ch/work/g/gligorov/public/Bs2DsKFitTuples/DV_v33r1/SmallTuples/
-DsK_KPiPi_MD_BDTG_MINI.root
-DsK_KPiPi_MU_BDTG_MINI.root
-DecayTree
-DecayTree
-###
-
-#BsDsK PiPiPi
-/afs/cern.ch/work/g/gligorov/public/Bs2DsKFitTuples/DV_v33r1/SmallTuples/
-DsK_PiPiPi_MD_BDTG_MINI.root
-DsK_PiPiPi_MU_BDTG_MINI.root
-DecayTree
-DecayTree
-###
-
-#PIDp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_TightCuts.root
-EffHistos_Reco12_39Mom_Proton_MagDown_TightCuts.root
-###
-
-#PID
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#RatioDataMC2D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-MomVsnTr_Comp_DPi_Down_hist.root
-MomVsnTr_Comp_DPi_Up_hist.root
-###
diff --git a/PhysFit/B2DXFitters/data/config_fitSignal.txt b/PhysFit/B2DXFitters/data/config_fitSignal.txt
deleted file mode 100644
index fc69208f52d97ccac42a17a780e70b768230c909..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/config_fitSignal.txt
+++ /dev/null
@@ -1,180 +0,0 @@
-#BdDPi
-/afs/cern.ch/work/g/gligorov/public/Bs2DsKFitTuples/
-FitTuple_MergedTree_Bd2DPi_D2KPiPi_MD_BDTG_MINI.root
-FitTuple_MergedTree_Bd2DPi_D2KPiPi_MU_BDTG_MINI.root
-DecayTree
-DecayTree
-###
-
-#Signal BDPi KPiPi
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bd2DPi_D2KPiPi_BdHypo_OFFLINE.root
-MergedTree_Bd2DPi_D2KPiPi_BdHypo_OFFLINE.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal BsDsPi HHHPi0
-/afs/cern.ch/work/l/lsestini/public/Data_BDT/
-MergedTree_Signal_Bs2DsPi_Ds2HHHPi0Resolved_dw.root
-MergedTree_Signal_Bs2DsPi_Ds2HHHPi0Resolved_up.root
-DecayTreeTuple/tuple
-DecayTreeTuple/tuple
-###
-
-#Signal BsDsPi KstK
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_KstK.root
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_KstK.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal BsDsPi PhiPi
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_PhiPi.root
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_PhiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal BsDsPi NonRes
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_NonRes.root
-MergedTree_Bs2DsPi_Ds2KKPi_BsHypo_OFFLINE_DsPi_NonRes.root
-DecayTree;1
-DecayTree;1
-###
-
-
-#Signal BsDsPi KPiPi
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2KPiPi_BsHypo_OFFLINE_DsPi_KPiPi.root
-MergedTree_Bs2DsPi_Ds2KPiPi_BsHypo_OFFLINE_DsPi_KPiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal BsDsPi PiPiPi
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsPi_Ds2PiPiPi_BsHypo_OFFLINE_DsPi_PiPiPi.root
-MergedTree_Bs2DsPi_Ds2PiPiPi_BsHypo_OFFLINE_DsPi_PiPiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-
-#Signal BsDsstPi
-/afs/cern.ch/work/a/adudziak/public/
-Merged_Bs2DsstPi_Ds2KKPi_MD_BsHypo_BDTG.root
-Merged_Bs2DsstPi_Ds2KKPi_MU_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal BsDsK KKPi old
-/afs/cern.ch/work/a/adudziak/public/
-Merged_Bs2DsK_Ds2KKPi_MD_BsHypo_BDTG.root
-Merged_Bs2DsK_Ds2KKPi_MU_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal BsDsK KstK
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_OFFLINE_DsK_KstK.root
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_OFFLINE_DsK_KstK.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal BsDsK PhiPi
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_OFFLINE_DsK_PhiPi.root
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_OFFLINE_DsK_PhiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal BsDsK NonRes
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_OFFLINE_DsK_NonRes.root
-MergedTree_Bs2DsK_Ds2KKPi_BsHypo_OFFLINE_DsK_NonRes.root
-DecayTree;1
-DecayTree;1
-###
-
-
-#Signal BsDsK KPiPi
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsK_Ds2KPiPi_BsHypo_OFFLINE_DsK_KPiPi.root
-MergedTree_Bs2DsK_Ds2KPiPi_BsHypo_OFFLINE_DsK_KPiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal BsDsK PiPiPi
-/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/
-MergedTree_Bs2DsK_Ds2PiPiPi_BsHypo_OFFLINE_DsK_PiPiPi.root
-MergedTree_Bs2DsK_Ds2PiPiPi_BsHypo_OFFLINE_DsK_PiPiPi.root
-DecayTree;1
-DecayTree;1
-###
-
-#Signal BsDsK HHHPi0
-/afs/cern.ch/work/l/lsestini/public/Data_BsDsK/
-MergedTree_Signal_Bs2DsK_Ds2HHHPi0Resolved_dw.root
-MergedTree_Signal_Bs2DsK_Ds2HHHPi0Resolved_up.root
-DecayTreeTuple/tuple;1
-DecayTreeTuple/tuple;1
-###
-
-Signal BdDsK
-/afs/cern.ch/work/a/adudziak/public/
-Merged_Bd2DsK_Ds2KKPi_MD_BsHypo_BDTG.root
-Merged_Bd2DsK_Ds2KKPi_MU_BsHypo_BDTG.root
-DecayTree;1
-DecayTree;1
-###
-
-#PIDp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_TightCuts.root
-EffHistos_Reco12_39Mom_Proton_MagUp_TightCuts.root
-###
-
-#PID
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PID2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_45678.root
-EffHistos_Reco12_39Mom_MagUp_3456.root
-###
-
-#PID2m2
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_0123.root
-EffHistos_Reco12_39Mom_MagUp_2m2_012.root
-###
-
-#PID2m22
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_45678.root
-EffHistos_Reco12_39Mom_MagUp_2m2_3456.root
-###
-
-#PIDp3
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_Proton_DLLKDLLpK.root
-EffHistos_Reco12_39Mom_MagUp_Proton_DLLKDLLpK.root
-###
-
-#RatioDataMC2D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-MomVsnTr_Comp_DPi_Down_hist.root
-MomVsnTr_Comp_DPi_Up_hist.root
-###
diff --git a/PhysFit/B2DXFitters/data/fsfd_5fb/Bd2DK/Bd2DKConfigForNominalMassFit.py b/PhysFit/B2DXFitters/data/fsfd_5fb/Bd2DK/Bd2DKConfigForNominalMassFit.py
deleted file mode 100644
index b3455a292723fda8e3148bcd31fea9deb10dc413..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/fsfd_5fb/Bd2DK/Bd2DKConfigForNominalMassFit.py
+++ /dev/null
@@ -1,165 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bd2DK"
-    configdict["CharmModes"] = {"KPiPi"}
-    configdict["Backgrounds"] = ["Bd2DPi","Bd2DRho","Bd2DstPi","Bd2DKst","Bd2DstK"]
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2012"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                  
-    configdict["IntegratedLuminosity"] = {"2011": {"Down": 0.59, "Up": 0.44}, "2012":{"Down": 0.9894, "Up": 0.9985}}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/fsfd_5fb/Bd2DK/config_Bd2DK.txt"
-    #settings for control plots                                                                                                                                                           
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBd2DK", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5000,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1830,    1920    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [2.302585,     5.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.1,     1.0     ], "InputName" : "BDTGResponse_3"} 
-
-    #additional cuts applied to data sets
-    lab = "&& lab1_M>200 && lab3_M > 200 && lab4_M < 200 && lab5_M <200"
-    mDKPi = "&&(lab2_MM-lab34_MM > 200) && (lab2_MM-lab35_MM > 200)"
-    D0Kpi1 = "&&!(abs(sqrt(pow(sqrt(pow(493.67,2)+pow(lab1_P,2))+sqrt(pow(lab5_M,2)+pow(lab5_P,2)),2)-pow(lab1_PX+lab5_PX,2)-pow(lab1_PY+lab5_PY,2)-pow(lab1_PZ+lab5_PZ,2))-1870)<20)"
-    D0Kpi2 = "&&!(abs(sqrt(pow(sqrt(pow(493.67,2)+pow(lab1_P,2))+sqrt(pow(lab4_M,2)+pow(lab4_P,2)),2)-pow(lab1_PX+lab4_PX,2)-pow(lab1_PY+lab4_PY,2)-pow(lab1_PZ+lab4_PZ,2))-1870)<20)"
-    life = "&&lab2_TAU>0&&lab2_FD_ORIVX > 0."
-    veto_lb1 = "&&!(fabs(lab2_MassHypo_Lambda_pi1 - 2286.4) < 30. && lab4_PIDp > 0)"
-    veto_lb2 = "&&!(fabs(lab2_MassHypo_Lambda_pi2 - 2286.4) < 30. && lab5_PIDp > 0)"
-    veto_dspi1 = "&&((lab2_MassHypo_Ds_pi1 < 1949. || lab2_MassHypo_Ds_pi1 > 2029. || lab4_PIDK < 0.))"
-    veto_dspi2 = "&&((lab2_MassHypo_Ds_pi2 < 1949. || lab2_MassHypo_Ds_pi2 > 2029. || lab5_PIDK < 0.))"
-    # additional cuts applied to data sets                                                                                    
-    
-
-    # additional cuts applied to data sets                                                                                    
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]   = { "Data": "lab2_TAU>0&&lab1_PIDmu<2" +mDKPi+D0Kpi1+D0Kpi2+life+veto_lb1+veto_lb2+veto_dspi1+veto_dspi2+lab,
-                                              "MC" : "lab2_TAU>0&&lab1_M>200"+mDKPi+D0Kpi1+D0Kpi2+life+lab,
-                                              "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    
-    # order of particles: KKPi, KPiPi, PiPiPi                                                                                                         
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"} #lab3 = K, lab4, lab5 = pi
-    # weighting templates by PID eff/misID                                                                                                                                                
-    #configdict["WeightingMassTemplates"] = { "Variables":["lab4_P","lab3_P"], "PIDBach": 0, "PIDChild": 0, "PIDProton": 5, "RatioDataMC":True }
-
-    # weighting templates by PID eff/misID, apply shifts to templates
-#    configdict["WeightingMassTemplates"] = {"PIDBachEff":    { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012 Mick"},
-#                                                               "Var":["nTracks","lab1_P"], "HistName":"K_DLLmu<2 && DLLK>10_All"},
-#                                            "PIDBachMisID":  { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012 Mick"},
-#                                                               "Var":["nTracks","lab1_P"], "HistName":"Pi_DLLmu<2 && DLLK>10_All"},
-#                                            "RatioDataMC":   { "FileLabel": {"2011":"#RatioDataMC 2011 PNTr", "2012": "#RatioDataMC 2011 PNTr"},
-#                                                               "Var":["lab1_P","nTracks"], "HistName":"histRatio"},
-#                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-    
-   # weighting templates by PID eff/misID, apply shifts to templates
-    configdict["WeightingMassTemplates"] = {"PIDBachEff":    { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012 Mick"},
-                                                               "Var":["lab1_P","nTracks"], "HistName":"K_DLLmu<2 && DLLK>10_All"},
-                                            "PIDBachMisID":  { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012 Mick"},
-                                                               "Var":["lab1_P","nTracks"], "HistName":"Pi_DLLmu<2 && DLLK>10_All"},
-                                            "RatioDataMC":   { "FileLabel": {"2011":"#RatioDataMC 2011 PNTr", "2012": "#RatioDataMC 2011 PNTr"},
-                                                               "Var":["lab1_P","nTracks"], "HistName":"histRatio"},
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-
-    # Bs signal shapes
-    configdict["BsSignalShape"] = {} 
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5280.0},     "Fixed": False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"KPiPi":16.132},   "Fixed": True} 
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"KPiPi":10.786},   "Fixed": True} 
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"KPiPi":-2.3530},  "Fixed": True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"KPiPi":2.0175},   "Fixed": True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"KPiPi":2.4218},   "Fixed": True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"KPiPi":1.1061},   "Fixed": True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"KPiPi":0.5},      "Fixed": True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"KPiPi":1.0 },     "Fixed": False}
-
-    # Ds signal shapes  
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1869.8},       "Fixed": False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"KPiPi":11.501},     "Fixed": True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"KPiPi":6.1237},     "Fixed": True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"KPiPi":1.6382},     "Fixed": True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"KPiPi":-3.4683},    "Fixed": True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"KPiPi":4.8678},     "Fixed": True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"KPiPi":4.3285e-06}, "Fixed": True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"KPiPi":0.38916},    "Fixed": True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"KPiPi":1.0 },       "Fixed": False}
-
-    # combinatorial background                                                                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"KPiPi":-1.0361e-03}, "Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"KPiPi":-0.01},       "Fixed": False}
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"KPiPi":0.5},         "Fixed": False}
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusDoubleCrystalBallWithWidthRatioSharedMean"
-    configdict["DsCombinatorialShape"]["sigma1"]  = {"Run1": {"KPiPi":11.501},          "Fixed":True}
-    configdict["DsCombinatorialShape"]["sigma2"]  = {"Run1": {"KPiPi":6.1237},          "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha1"]  = {"Run1": {"KPiPi":1.6382},          "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha2"]  = {"Run1": {"KPiPi":-3.4683},         "Fixed":True}
-    configdict["DsCombinatorialShape"]["n1"]      = {"Run1": {"KPiPi":4.8678},          "Fixed":True}
-    configdict["DsCombinatorialShape"]["n2"]      = {"Run1": {"KPiPi":4.3285e-06},      "Fixed":True}
-    configdict["DsCombinatorialShape"]["frac"]    = {"Run1": {"KPiPi":0.38916},         "Fixed":True}
-    configdict["DsCombinatorialShape"]["R"]       = {"Run1": {"KPiPi":1.5},             "Fixed":False}
-    configdict["DsCombinatorialShape"]["cB"]      = {"Run1": {"KPiPi":-1.9193e-03},     "Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"KPiPi":0.5},             "Fixed":False}
-
-
-    configdict["BeautyMassBd2DstKShape"] = {}
-    configdict["BeautyMassBd2DstKShape"]["type"]  = "DoubleGaussianSeparatedMean"
-    configdict["BeautyMassBd2DstKShape"]["sigma1"]  = {"Run1": {"KPiPi":15.0},          "Fixed":False}
-    configdict["BeautyMassBd2DstKShape"]["sigma2"]  = {"Run1": {"KPiPi":15.0},          "Fixed":False}
-    configdict["BeautyMassBd2DstKShape"]["mean"]    = {"Run1": {"KPiPi":5050.0},        "Fixed":False}
-    configdict["BeautyMassBd2DstKShape"]["mean2"]   = {"Run1": {"KPiPi":5100.0},        "Fixed":False}
-    configdict["BeautyMassBd2DstKShape"]["frac"]   = {"Run1": {"KPiPi":0.5},        "Fixed":False}
-
-    # Additional parameters
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed": False} 
-    configdict["AdditionalParameters"]["g1_f2_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed": False}
-
-    # expected yields 
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bd2DPi"]    = {"2011": {"KPiPi":15000.0},  "2012": {"KPiPi":2000.0},  "Fixed": False} 
-    configdict["Yields"]["Bd2DRho"]   = {"2011": {"KPiPi":80000.0},  "2012": {"KPiPi":2000.0}, "Fixed": False}
-    configdict["Yields"]["Bd2DstPi"]  = {"2011": {"KPiPi":3000.0},  "2012": {"KPiPi":100000.0}, "Fixed": False}
-    configdict["Yields"]["Bd2DKst"]   = {"2011": {"KPiPi":30000.0},  "2012": {"KPiPi":200000.0}, "Fixed": False}
-    configdict["Yields"]["Bd2DstK"]   = {"2011": {"KPiPi":30000.0},  "2012": {"KPiPi":200000.0}, "Fixed": False}
-    configdict["Yields"]["CombBkg"]   = {"2011": {"KPiPi":30000.0},  "2012": {"KPiPi":60000.0},  "Fixed": False}
-    configdict["Yields"]["Signal"]    = {"2011": {"KPiPi":150000.0}, "2012": {"KPiPi":300000.0}, "Fixed": False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bd2DPi", "Bd2DRho", "Bd2DstPi", "Bd2DKst", "Bd2DstK"] 
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kRed, kBlue-10, kYellow, kMagenta+2]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":1.2}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.7, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":1.2}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/fsfd_5fb/Bd2DK/Bd2DKConfigForNominalMassFit_PIDK10.py b/PhysFit/B2DXFitters/data/fsfd_5fb/Bd2DK/Bd2DKConfigForNominalMassFit_PIDK10.py
deleted file mode 100644
index cd0f6c4f87aaa3b10962d4e65c9187bbcd0d9e7d..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/fsfd_5fb/Bd2DK/Bd2DKConfigForNominalMassFit_PIDK10.py
+++ /dev/null
@@ -1,145 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bd2DK"
-    configdict["CharmModes"] = {"KPiPi"}
-    configdict["Backgrounds"] = ["Bd2DPi","Bd2DRho","Bd2DstPi","Bd2DKst","Bd2DstK"]
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2012"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                  
-    configdict["IntegratedLuminosity"] = {"2011": {"Down": 0.59, "Up": 0.44}, "2012":{"Down": 0.9894, "Up": 0.9985}}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/fsfd_5fb/Bd2DK/config_Bd2DK.txt"
-    #settings for control plots                                                                                                                                                           
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBd2DK", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5200,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1830,    1920    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [2.302585,     5.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.1,     1.0     ], "InputName" : "BDTGResponse_3"} 
-
-    #additional cuts applied to data sets
-    lab = "&& lab1_M>200 && lab3_M > 200 && lab4_M < 200 && lab5_M <200"
-    mDKPi = "&&(lab2_MM-lab34_MM > 200) && (lab2_MM-lab35_MM > 200)"
-    D0Kpi1 = "&&!(abs(sqrt(pow(sqrt(pow(493.67,2)+pow(lab1_P,2))+sqrt(pow(lab5_M,2)+pow(lab5_P,2)),2)-pow(lab1_PX+lab5_PX,2)-pow(lab1_PY+lab5_PY,2)-pow(lab1_PZ+lab5_PZ,2))-1870)<20)"
-    D0Kpi2 = "&&!(abs(sqrt(pow(sqrt(pow(493.67,2)+pow(lab1_P,2))+sqrt(pow(lab4_M,2)+pow(lab4_P,2)),2)-pow(lab1_PX+lab4_PX,2)-pow(lab1_PY+lab4_PY,2)-pow(lab1_PZ+lab4_PZ,2))-1870)<20)"
-    life = "&&lab2_TAU>0&&lab2_FD_ORIVX > 0."
-    veto_lb1 = "&&!(fabs(lab2_MassHypo_Lambda_pi1 - 2286.4) < 30. && lab4_PIDp > 0)"
-    veto_lb2 = "&&!(fabs(lab2_MassHypo_Lambda_pi2 - 2286.4) < 30. && lab5_PIDp > 0)"
-    veto_dspi1 = "&&((lab2_MassHypo_Ds_pi1 < 1949. || lab2_MassHypo_Ds_pi1 > 2029. || lab4_PIDK < 0.))"
-    veto_dspi2 = "&&((lab2_MassHypo_Ds_pi2 < 1949. || lab2_MassHypo_Ds_pi2 > 2029. || lab5_PIDK < 0.))"
-    # additional cuts applied to data sets                                                                                    
-   
-
-    # additional cuts applied to data sets                                                                                    
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]   = { "Data": "lab2_TAU>0&&lab1_PIDmu<2" +mDKPi+D0Kpi1+D0Kpi2+life+veto_lb1+veto_lb2+veto_dspi1+veto_dspi2+lab,
-                                              "MC" : "lab2_TAU>0&&lab1_M>200"+mDKPi+D0Kpi1+D0Kpi2+life+lab,
-                                              "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    
-    # order of particles: KKPi, KPiPi, PiPiPi                                                                                                         
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"} #lab3 = K, lab4, lab5 = pi
-    # weighting templates by PID eff/misID                                                                                                                                                
-    #configdict["WeightingMassTemplates"] = { "Variables":["lab4_P","lab3_P"], "PIDBach": 0, "PIDChild": 0, "PIDProton": 5, "RatioDataMC":True }
-
-    # weighting templates by PID eff/misID, apply shifts to templates
-    configdict["WeightingMassTemplates"] = {"PIDBachEff":    { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012 Mick"},
-                                                               "Var":["lab1_P","nTracks"], "HistName":"K_DLLmu<2 && DLLK>10_All"},
-                                            "PIDBachMisID":  { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012 Mick"},
-                                                               "Var":["lab1_P","nTracks"], "HistName":"Pi_DLLmu<2 && DLLK>10_All"},
-                                            "RatioDataMC":   { "FileLabel": {"2011":"#RatioDataMC 2011 PNTr", "2012": "#RatioDataMC 2011 PNTr"},
-                                                               "Var":["lab1_P","nTracks"], "HistName":"histRatio"},
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-
-    # Bs signal shapes
-    configdict["BsSignalShape"] = {} 
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5280.0},      "Fixed": False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"KPiPi":16.132},    "Fixed": True} 
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"KPiPi":10.786},    "Fixed": True} 
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"KPiPi":-2.3530},   "Fixed": True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"KPiPi":2.0175},    "Fixed": True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"KPiPi":2.4218},    "Fixed": True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"KPiPi":1.1061},    "Fixed": True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"KPiPi":0.50},      "Fixed": True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"KPiPi":1.0 },      "Fixed": False}
-
-    # Ds signal shapes  
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1869.8},       "Fixed": False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"KPiPi":11.501},     "Fixed": True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"KPiPi":6.1237},     "Fixed": True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"KPiPi":1.6382},     "Fixed": True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"KPiPi":-3.4683},    "Fixed": True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"KPiPi":4.8678},     "Fixed": True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"KPiPi":4.3285e-06}, "Fixed": True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"KPiPi":0.38916},    "Fixed": True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"KPiPi":1.0 },       "Fixed": False}
-
-    # combinatorial background                                                                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"KPiPi":-1.0361e-03}, "Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"KPiPi":-0.01},       "Fixed": False}
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"KPiPi":0.5},         "Fixed": False}
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusDoubleCrystalBallWithWidthRatioSharedMean"
-    configdict["DsCombinatorialShape"]["sigma1"]  = {"Run1": {"KPiPi":11.501},          "Fixed":True}
-    configdict["DsCombinatorialShape"]["sigma2"]  = {"Run1": {"KPiPi":6.1237},          "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha1"]  = {"Run1": {"KPiPi":1.6382},          "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha2"]  = {"Run1": {"KPiPi":-3.4683},         "Fixed":True}
-    configdict["DsCombinatorialShape"]["n1"]      = {"Run1": {"KPiPi":4.8678},          "Fixed":True}
-    configdict["DsCombinatorialShape"]["n2"]      = {"Run1": {"KPiPi":4.3285e-06},      "Fixed":True}
-    configdict["DsCombinatorialShape"]["frac"]    = {"Run1": {"KPiPi":0.38916},         "Fixed":True}
-    configdict["DsCombinatorialShape"]["R"]       = {"Run1": {"KPiPi":1.5},             "Fixed":False}
-    configdict["DsCombinatorialShape"]["cB"]      = {"Run1": {"KPiPi":-1.9193e-03},     "Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"KPiPi":0.5},             "Fixed":False}
-
-    # Additional parameters
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed": False} 
-    configdict["AdditionalParameters"]["g1_f2_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed": False}
-
-    # expected yields 
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bd2DPi"]    = {"2011": {"KPiPi":15000.0},  "2012": {"KPiPi":2000.0},  "Fixed": False} 
-    configdict["Yields"]["Bd2DRho"]   = {"2011": {"KPiPi":80000.0},  "2012": {"KPiPi":2000.0}, "Fixed": False}
-    configdict["Yields"]["Bd2DstPi"]  = {"2011": {"KPiPi":3000.0},  "2012": {"KPiPi":100000.0}, "Fixed": False}
-    configdict["Yields"]["Bd2DKst"]   = {"2011": {"KPiPi":30000.0},  "2012": {"KPiPi":200000.0}, "Fixed": False}
-    configdict["Yields"]["CombBkg"]   = {"2011": {"KPiPi":30000.0},  "2012": {"KPiPi":60000.0},  "Fixed": False}
-    configdict["Yields"]["Signal"]    = {"2011": {"KPiPi":150000.0}, "2012": {"KPiPi":300000.0}, "Fixed": False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bd2DPi", "Bd2DRho", "Bd2DstPi", "Bd2DKst"] 
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kRed, kBlue-10, kYellow]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":2.5}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.7, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":1.2}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/fsfd_5fb/Bd2DK/Bd2DKConfigForNominalMassFit_new.py b/PhysFit/B2DXFitters/data/fsfd_5fb/Bd2DK/Bd2DKConfigForNominalMassFit_new.py
deleted file mode 100644
index e2448d54f680172281d74ab0b872343fa3b0dc25..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/fsfd_5fb/Bd2DK/Bd2DKConfigForNominalMassFit_new.py
+++ /dev/null
@@ -1,192 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bd2DK"
-    configdict["CharmModes"] = {"KPiPi"}
-    configdict["Backgrounds"] = ["Bd2DPi","Bd2DRho","Bd2DstPi","Bd2DKst","Bd2DstK"]
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2012"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2012":"21", "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                  
-    configdict["IntegratedLuminosity"] = {"2011": {"Down": 0.59, "Up": 0.44}, "2012":{"Down": 0.9894, "Up": 0.9985}}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/fsfd_5fb/Bd2DK/config_Bd2DK.txt"
-    #settings for control plots                                                                                                                                                           
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBd2DK", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5000,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1830,    1920    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [2.302585,     5.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.1,     1.0     ], "InputName" : "BDTGResponse_3"} 
-
-    #additional cuts applied to data sets
-    lab = "&& lab1_M>200 && lab3_M > 200 && lab4_M < 200 && lab5_M <200"
-    mDKPi = "&&(lab2_MM-lab34_MM > 200) && (lab2_MM-lab35_MM > 200)"
-    D0Kpi1 = "&&!(abs(sqrt(pow(sqrt(pow(493.67,2)+pow(lab1_P,2))+sqrt(pow(lab5_M,2)+pow(lab5_P,2)),2)-pow(lab1_PX+lab5_PX,2)-pow(lab1_PY+lab5_PY,2)-pow(lab1_PZ+lab5_PZ,2))-1870)<20)"
-    D0Kpi2 = "&&!(abs(sqrt(pow(sqrt(pow(493.67,2)+pow(lab1_P,2))+sqrt(pow(lab4_M,2)+pow(lab4_P,2)),2)-pow(lab1_PX+lab4_PX,2)-pow(lab1_PY+lab4_PY,2)-pow(lab1_PZ+lab4_PZ,2))-1870)<20)"
-    life = "&&lab2_TAU>0&&lab2_FD_ORIVX > 0."
-    veto_lb1 = "&&!(fabs(lab2_MassHypo_Lambda_pi1 - 2286.4) < 30. && lab4_PIDp > 0)"
-    veto_lb2 = "&&!(fabs(lab2_MassHypo_Lambda_pi2 - 2286.4) < 30. && lab5_PIDp > 0)"
-    veto_dspi1 = "&&((lab2_MassHypo_Ds_pi1 < 1949. || lab2_MassHypo_Ds_pi1 > 2029. || lab4_PIDK < 0.))"
-    veto_dspi2 = "&&((lab2_MassHypo_Ds_pi2 < 1949. || lab2_MassHypo_Ds_pi2 > 2029. || lab5_PIDK < 0.))"
-    # additional cuts applied to data sets                                                                                    
-    
-
-    # additional cuts applied to data sets                                                                                    
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]   = { "Data": "lab2_TAU>0&&lab1_PIDmu<2" +mDKPi+D0Kpi1+D0Kpi2+life+veto_lb1+veto_lb2+veto_dspi1+veto_dspi2+lab,
-                                              "MC" : "lab2_TAU>0&&lab1_M>200"+mDKPi+D0Kpi1+D0Kpi2+life+lab,
-                                              "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    
-    # order of particles: KKPi, KPiPi, PiPiPi                                                                                                         
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"} #lab3 = K, lab4, lab5 = pi
-    # weighting templates by PID eff/misID                                                                                                                                                
-    #configdict["WeightingMassTemplates"] = { "Variables":["lab4_P","lab3_P"], "PIDBach": 0, "PIDChild": 0, "PIDProton": 5, "RatioDataMC":True }
-
-    # weighting templates by PID eff/misID, apply shifts to templates
-#    configdict["WeightingMassTemplates"] = {"PIDBachEff":    { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012 Mick"},
-#                                                               "Var":["nTracks","lab1_P"], "HistName":"K_DLLmu<2 && DLLK>10_All"},
-#                                            "PIDBachMisID":  { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012 Mick"},
-#                                                               "Var":["nTracks","lab1_P"], "HistName":"Pi_DLLmu<2 && DLLK>10_All"},
-#                                            "RatioDataMC":   { "FileLabel": {"2011":"#RatioDataMC 2011 PNTr", "2012": "#RatioDataMC 2011 PNTr"},
-#                                                               "Var":["lab1_P","nTracks"], "HistName":"histRatio"},
-#                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-    
-   # weighting templates by PID eff/misID, apply shifts to templates
-    configdict["WeightingMassTemplates"] = {"PIDBachEff":    { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012 Mick"},
-                                                               "Var":["lab1_P","nTracks"], "HistName":"K_DLLmu<2 && DLLK>10_All"},
-                                            "PIDBachMisID":  { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012 Mick"},
-                                                               "Var":["lab1_P","nTracks"], "HistName":"Pi_DLLmu<2 && DLLK>10_All"},
-                                            "RatioDataMC":   { "FileLabel": {"2011":"#RatioDataMC 2011 PNTr", "2012": "#RatioDataMC 2011 PNTr"},
-                                                               "Var":["lab1_P","nTracks"], "HistName":"histRatio"},
-                                            "Shift":{ "BeautyMass": 2.5, "CharmMass": 0.0} }
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-
-    # Bs signal shapes
-
-    configdict["SignalShape"] = {}
-    configdict["SignalShape"]["BeautyMass"] = {}
-    configdict["SignalShape"]["BeautyMass"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["SignalShape"]["BeautyMass"]["mean"]    = {"Run1": {"All":5280.0},     "Fixed": False}
-    configdict["SignalShape"]["BeautyMass"]["sigma1"]  = {"Run1": {"KPiPi":16.132},   "Fixed": True}
-    configdict["SignalShape"]["BeautyMass"]["sigma2"]  = {"Run1": {"KPiPi":10.786},   "Fixed": True}
-    configdict["SignalShape"]["BeautyMass"]["alpha1"]  = {"Run1": {"KPiPi":-2.3530},  "Fixed": True}
-    configdict["SignalShape"]["BeautyMass"]["alpha2"]  = {"Run1": {"KPiPi":2.0175},   "Fixed": True}
-    configdict["SignalShape"]["BeautyMass"]["n1"]      = {"Run1": {"KPiPi":2.4218},   "Fixed": True}
-    configdict["SignalShape"]["BeautyMass"]["n2"]      = {"Run1": {"KPiPi":1.1061},   "Fixed": True}
-    configdict["SignalShape"]["BeautyMass"]["frac"]    = {"Run1": {"KPiPi":0.5},      "Fixed": True}
-    configdict["SignalShape"]["BeautyMass"]["R"]       = {"Run1": {"KPiPi":1.0 },     "Fixed": False}
-
-    '''
-    configdict["BsSignalShape"] = {} 
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5280.0},     "Fixed": False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"KPiPi":16.132},   "Fixed": True} 
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"KPiPi":10.786},   "Fixed": True} 
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"KPiPi":-2.3530},  "Fixed": True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"KPiPi":2.0175},   "Fixed": True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"KPiPi":2.4218},   "Fixed": True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"KPiPi":1.1061},   "Fixed": True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"KPiPi":0.5},      "Fixed": True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"KPiPi":1.0 },     "Fixed": False}
-    '''
-
-    # Ds signal shapes  
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1869.8},       "Fixed": False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"KPiPi":11.501},     "Fixed": True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"KPiPi":6.1237},     "Fixed": True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"KPiPi":1.6382},     "Fixed": True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"KPiPi":-3.4683},    "Fixed": True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"KPiPi":4.8678},     "Fixed": True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"KPiPi":4.3285e-06}, "Fixed": True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"KPiPi":0.38916},    "Fixed": True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"KPiPi":1.0 },       "Fixed": False}
-    
-    # combinatorial background                                                                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"KPiPi":-1.0361e-03}, "Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"KPiPi":-0.01},       "Fixed": False}
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"KPiPi":0.5},         "Fixed": False}
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusDoubleCrystalBallWithWidthRatioSharedMean"
-    configdict["DsCombinatorialShape"]["sigma1"]  = {"Run1": {"KPiPi":11.501},          "Fixed":True}
-    configdict["DsCombinatorialShape"]["sigma2"]  = {"Run1": {"KPiPi":6.1237},          "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha1"]  = {"Run1": {"KPiPi":1.6382},          "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha2"]  = {"Run1": {"KPiPi":-3.4683},         "Fixed":True}
-    configdict["DsCombinatorialShape"]["n1"]      = {"Run1": {"KPiPi":4.8678},          "Fixed":True}
-    configdict["DsCombinatorialShape"]["n2"]      = {"Run1": {"KPiPi":4.3285e-06},      "Fixed":True}
-    configdict["DsCombinatorialShape"]["frac"]    = {"Run1": {"KPiPi":0.38916},         "Fixed":True}
-    configdict["DsCombinatorialShape"]["R"]       = {"Run1": {"KPiPi":1.5},             "Fixed":False}
-    configdict["DsCombinatorialShape"]["cB"]      = {"Run1": {"KPiPi":-1.9193e-03},     "Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"KPiPi":0.5},             "Fixed":False}
-
-
-    configdict["Bd2DstKShape"] = {}
-    configdict["Bd2DstKShape"]["BeautyMass"] = {} 
-    configdict["Bd2DstKShape"]["BeautyMass"]["type"]  = "DoubleGaussianSeparatedMean"
-    configdict["Bd2DstKShape"]["BeautyMass"]["sigma1"]  = {"Run1": {"KPiPi":15.0},          "Fixed":False}
-    configdict["Bd2DstKShape"]["BeautyMass"]["sigma2"]  = {"Run1": {"KPiPi":15.0},          "Fixed":False}
-    configdict["Bd2DstKShape"]["BeautyMass"]["mean"]    = {"Run1": {"KPiPi":5050.0},        "Fixed":False}
-    configdict["Bd2DstKShape"]["BeautyMass"]["mean2"]   = {"Run1": {"KPiPi":5100.0},        "Fixed":False}
-    configdict["Bd2DstKShape"]["BeautyMass"]["frac"]    = {"Run1": {"KPiPi":0.5},        "Fixed":False}
-    
-    configdict["Bd2DstKShape"]["CharmMass"] = {}
-    configdict["Bd2DstKShape"]["CharmMass"]["type"]  = "Signal"
-
-    # Additional parameters
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed": False} 
-    configdict["AdditionalParameters"]["g1_f2_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed": False}
-
-    # expected yields 
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bd2DPi"]    = {"2011": {"KPiPi":15000.0},  "2012": {"KPiPi":2000.0},  "Fixed": False} 
-    configdict["Yields"]["Bd2DRho"]   = {"2011": {"KPiPi":80000.0},  "2012": {"KPiPi":2000.0}, "Fixed": False}
-    configdict["Yields"]["Bd2DstPi"]  = {"2011": {"KPiPi":3000.0},  "2012": {"KPiPi":100000.0}, "Fixed": False}
-    configdict["Yields"]["Bd2DKst"]   = {"2011": {"KPiPi":30000.0},  "2012": {"KPiPi":200000.0}, "Fixed": False}
-    configdict["Yields"]["Bd2DstK"]   = {"2011": {"KPiPi":30000.0},  "2012": {"KPiPi":200000.0}, "Fixed": False}
-    configdict["Yields"]["CombBkg"]   = {"2011": {"KPiPi":30000.0},  "2012": {"KPiPi":60000.0},  "Fixed": False}
-    configdict["Yields"]["Signal"]    = {"2011": {"KPiPi":150000.0}, "2012": {"KPiPi":300000.0}, "Fixed": False}
-
-
-#    configdict["Model"] = {}
-#    configdict["Model"]["components"] = ["Sig", "CombBkg", "Bd2DPi", "Bd2DRho", "Bd2DstPi", "Bd2DKst", "Bd2DstK"]
-#    configdict["Model"]["combined"] = {}
-#    configdict["Model"]["combined"]["Bd2DstKst"]    = {"components":["Bd2DKst","Bd2DstK"], "frac":["f1_g1"]:, "recursive":True} 
-#    configdict["Model"]["combined"]["Bd2DDstPiRho"] = {"components":["Bd2DPi","Bd2DRho","Bd2DstPi"], "frac":["f1_g2","f2_g2"]:, "recursive":True}
-#    configdict["Model"]["combined"]["Background"]   = {"components":["Bd2DstKst","Bd2DDstPiRho"], "frac":"f1_g3":, "recursive":True}
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bd2DPi", "Bd2DRho", "Bd2DstPi", "Bd2DKst", "Bd2DstK"] 
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kRed, kBlue-10, kYellow, kMagenta+2]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":1.2}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.7, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":1.2}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/fsfd_5fb/Bd2DK/config_Bd2DK.txt b/PhysFit/B2DXFitters/data/fsfd_5fb/Bd2DK/config_Bd2DK.txt
deleted file mode 100644
index 47315af8572fa9a010e48945f5ed60fbcba5f8a1..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/fsfd_5fb/Bd2DK/config_Bd2DK.txt
+++ /dev/null
@@ -1,302 +0,0 @@
-#Bd2DK KPiPi 2011 blabla
-root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb/MERGED/
-Bd_Dpi_2011_Dw.root
-Bd_Dpi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bd2DK KPiPi 2012 blabla
-#root://eoslhcb.cern.ch//eos/lhcb/user/l/lbel/TD_DsK3fb/MERGED/
-#Bd_Dpi_2012_Dw.root
-#Bd_Dpi_2012_Up.root
-#DecayTree
-#DecayTree
-###
-
-#Bd2DK KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/user/m/mvitti/B2DK_rootFiles/Data/
-Data_2012_up_MINI_BDTG3_Bd.root
-Data_2012_dw_MINI_BDTG3_Bd.root
-DecayTree
-DecayTree
-###
-
-#sWeights
-/afs/cern.ch/work/a/adudziak/public/sWeights/
-sWeights_BsDsPi_all_both.root
-sWeights_BsDsPi_all_both.root
-merged
-merged
-###
-
-#Signal Bd2DK KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/user/m/mvitti/B2DK_rootFiles/Signal/
-Signal_2012_dw_MINI_BDTG3_Bd.root
-Signal_2012_up_MINI_BDTG3_Bd.root
-DecayTree
-DecayTree
-###
-
-
-#MC FileName KPiPi MD 2011 blabla
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3//B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-rho+_Dn_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_Dst-pi+_D-pi0_Dn_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KPiPi MU 2011 blabla
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3//B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-rho+_Up_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_Dst-pi+_D-pi0_Up_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KPiPi MD 2012 blabla
-#{"Mode":"Bd2DPi",
-# "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3//B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG3_Bd.root",
-# "TreeName":"DecayTree"}
-#{"Mode":"Bd2DRho",
-# "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-rho+_Dn_BDTG3_Bd.root",
-# "TreeName":"DecayTree"}
-#{"Mode":"Bd2DstPi",
-# "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_Dst-pi+_D-pi0_Dn_BDTG3_Bd.root",
-# "TreeName":"DecayTree"}
-###
-
-#MC FileName KPiPi MU 2012 blabla
-#{"Mode":"Bd2DPi",
-# "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3//B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG3_Bd.root",
-# "TreeName":"DecayTree"}
-#{"Mode":"Bd2DRho",
-# "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-rho+_Up_BDTG3_Bd.root",
-# "TreeName":"DecayTree"}
-#{"Mode":"Bd2DstPi",
-# "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_Dst-pi+_D-pi0_Up_BDTG3_Bd.root",
-# "TreeName":"DecayTree"}
-###
-
-#MC FileName KPiPi MD 2012
-{"Mode": "Bd2DPi",
- "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/m/mvitti/B2DK_rootFiles/Background/Bd2DPi_2012_dw_MINI_Bd_BDTG3.root",
- "TreeName": "DecayTree"}
-{"Mode": "Bd2DRho",
- "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/m/mvitti/B2DK_rootFiles/Background/Bd2DRho_2012_dw_MINI_Bd_BDTG3.root",
- "TreeName": "DecayTree"}
-{"Mode": "Bd2DstPi",
- "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/m/mvitti/B2DK_rootFiles/Background/Bd2DstPi_2012_dw_MINI_Bd_BDTG3.root",
- "TreeName": "DecayTree"}
-{"Mode": "Bd2DKst",
- "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/m/mvitti/B2DK_rootFiles/Background/Bd2DKst_2012_dw_MINI_Bd_BDTG3.root",
- "TreeName": "DecayTree"}
-###
-
-#MC FileName KPiPi MU 2012
-{"Mode": "Bd2DPi",
- "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/m/mvitti/B2DK_rootFiles/Background/Bd2DPi_2012_up_MINI_Bd_BDTG3.root",
- "TreeName": "DecayTree"}
-{"Mode": "Bd2DRho",
- "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/m/mvitti/B2DK_rootFiles/Background/Bd2DRho_2012_up_MINI_Bd_BDTG3.root",
- "TreeName": "DecayTree"}
-{"Mode": "Bd2DstPi",
- "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/m/mvitti/B2DK_rootFiles/Background/Bd2DstPi_2012_up_MINI_Bd_BDTG3.root",
- "TreeName": "DecayTree"}
-{"Mode": "Bd2DKst",
- "FileName": "root://eoslhcb.cern.ch//eos/lhcb/user/m/mvitti/B2DK_rootFiles/Background/Bd2DKst_2012_up_MINI_Bd_BDTG3.root",
- "TreeName": "DecayTree"}
-###
-
-#PID Pion 2012 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21_2012_MagDown_P.root
-Pi_Strip21_2012_MagUp_P.root
-###
-
-#PID Kaon 2012 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21_2012_MagDown_P.root
-K_Strip21_2012_MagUp_P.root
-###
-
-#PID ProtonXXX 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_TotLc_Strip21_2012_MagDown_P.root
-P_TotLc_Strip21_2012_MagUp_P.root
-###
-
-#PID Proton 2012 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip20_2012_MagDown_P.root
-P_Strip20_2012_MagUp_P.root
-###
-
-#PID Pion 2011 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21r1_2011_MagDown_P.root
-Pi_Strip21r1_2011_MagUp_P.root
-###
-
-#PID Kaon 2011 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21r1_2011_MagDown_P.root
-K_Strip21r1_2011_MagUp_P.root
-###
-
-#PID ProtonXXX 2011 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_TotLc_Strip21r1_2011_MagDown_P.root
-P_TotLc_Strip21r1_2011_MagUp_P.root
-###
-
-#PID Proton 2011 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip20r1_2011_MagDown_P.root
-P_Strip20r1_2011_MagUp_P.root
-###
-
-
-#PIDp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_TightCuts.root
-EffHistos_Reco12_39Mom_Proton_MagUp_TightCuts.root
-###
-
-#PID
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PIDK Pion 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21r1_2011_MagDown_nTracks_P.root
-Pi_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Pion 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21_2012_MagDown_nTracks_P.root
-Pi_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21r1_2011_MagDown_nTracks_P.root
-K_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21_2012_MagDown_nTracks_P.root
-K_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2012 Mick
-root://eoslhcb.cern.ch//eos/lhcb/user/m/mmulder/forAgnieszka/
-PerfHists_K_Strip21_MagDown_fsfd_P_nTracks.root
-PerfHists_K_Strip21_MagUp_fsfd_P_nTracks.root
-###
-
-#PIDK Pion 2012 Mick
-root://eoslhcb.cern.ch//eos/lhcb/user/m/mmulder/forAgnieszka/
-PerfHists_Pi_Strip21_MagDown_fsfd_P_nTracks.root
-PerfHists_Pi_Strip21_MagUp_fsfd_P_nTracks.root
-###
-
-
-#PIDp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_TightCuts.root
-EffHistos_Reco12_39Mom_Proton_MagUp_TightCuts.root
-###
-
-#PID3
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PID
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PID2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_45678.root
-EffHistos_Reco12_39Mom_MagUp_3456.root
-###
-
-
-#PID Dsp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_DLLpDLLpK.root
-EffHistos_Reco12_39Mom_Proton_MagDown_DLLpDLLpK.root
-###
-
-#PIDp2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_36Mom_Proton_MagDown_DLL.root
-EffHistos_Reco12_36Mom_Proton_MagUp_DLL.root
-###
-
-#RatioDataMC2D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-MomVsnTr_Comp_DPi_Down_hist.root
-MomVsnTr_Comp_DPi_Up_hist.root
-###
-
-#RatioDataMC3D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-PtVsnTrVsP_Comp_DPi_Down_hist.root
-PtVsnTrVsP_Comp_DPi_Up_hist.root
-###
-
-#RatioDataMC 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/
-MomVsnTr_Comp_DPi_2011_dw_hist.root
-MomVsnTr_Comp_DPi_2011_up_hist.root
-###
-
-#RatioDataMC 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/
-MomVsnTr_Comp_DPi_2012_dw_hist.root
-MomVsnTr_Comp_DPi_2012_up_hist.root
-
-#RatioDataMC 2011 PNTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PNTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-
-#RatioDataMC 2011 PNTr Filtered
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/filtered/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PNTr Filtered
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/filtered/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
diff --git a/PhysFit/B2DXFitters/data/fsfd_5fb/Bd2DPi/Bd2DPiConfigForNominalMassFit.py b/PhysFit/B2DXFitters/data/fsfd_5fb/Bd2DPi/Bd2DPiConfigForNominalMassFit.py
deleted file mode 100644
index 32aad25630849ef8ee2d6cd04e87c5f689ccedad..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/fsfd_5fb/Bd2DPi/Bd2DPiConfigForNominalMassFit.py
+++ /dev/null
@@ -1,182 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bd2DPi"
-    configdict["CharmModes"] = {"KPiPi"}
-    configdict["Backgrounds"] = ["Bd2DK","Bd2DRho","Bd2DstPi","Lb2LcPi","Bs2DsPi"]
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2012"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2011":"21r1", "2012":"21"}  # , "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                  
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.56, "Up": 0.42}, "2012":{"Down": 0.9912, "Up": 0.9988}}  #"2011": {"Down":  0.56, "Up": 0.42}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/fsfd_5fb/Bd2DPi/config_Bd2DPi.txt" 
-    #settings for control plots
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBd2DPi", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5000,    5800    ], "InputName" : "lab0_MassFitConsD_M"} #data 5000-5800, then you can change to whatever you want 
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1830,    1920    ], "InputName" : "lab2_MM"}  # data 1830 - 1920, 
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,    6.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.1,     1.0     ], "InputName" : "BDTGResponse_3"} 
-
-    #additional cuts applied to data sets
-    lab = "&& lab1_M<200 && lab3_M > 200 && lab4_M < 200 && lab5_M <200" 
-    mDKPi = "&&(lab2_MM-lab34_MM > 200) && (lab2_MM-lab35_MM > 200)"
-    D0Kpi1 = "&&!(abs(sqrt(pow(sqrt(pow(493.67,2)+pow(lab1_P,2))+sqrt(pow(lab5_M,2)+pow(lab5_P,2)),2)-pow(lab1_PX+lab5_PX,2)-pow(lab1_PY+lab5_PY,2)-pow(lab1_PZ+lab5_PZ,2))-1870)<20)"
-    D0Kpi2 = "&&!(abs(sqrt(pow(sqrt(pow(493.67,2)+pow(lab1_P,2))+sqrt(pow(lab4_M,2)+pow(lab4_P,2)),2)-pow(lab1_PX+lab4_PX,2)-pow(lab1_PY+lab4_PY,2)-pow(lab1_PZ+lab4_PZ,2))-1870)<20)"
-    life = "&&lab2_TAU>0&&lab2_FD_ORIVX > 0."
-    veto_lb1 = "&&!(fabs(lab2_MassHypo_Lambda_pi1 - 2286.4) < 30. && lab4_PIDp > 0)"
-    veto_lb2 = "&&!(fabs(lab2_MassHypo_Lambda_pi2 - 2286.4) < 30. && lab5_PIDp > 0)"
-    veto_dspi1 = "&&((lab2_MassHypo_Ds_pi1 < 1949. || lab2_MassHypo_Ds_pi1 > 2029. || lab4_PIDK < 0.))"
-    veto_dspi2 = "&&((lab2_MassHypo_Ds_pi2 < 1949. || lab2_MassHypo_Ds_pi2 > 2029. || lab5_PIDK < 0.))"
-    # additional cuts applied to data sets                                                                                    
-    HLTcut = "(lab0_Hlt1TrackAllL0Decision_TOS == 1 && (lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo4BodyBBDTDecision_TOS == 1) && (lab0_L0HadronDecision_TOS || lab0_L0Global_TIS ==1))";
-
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab1_PIDK<0&&lab2_TAU>0&&lab1_PIDmu<2" +mDKPi+D0Kpi1+D0Kpi2+life+veto_lb1+veto_lb2+veto_dspi1+veto_dspi2+lab, 
-						"MC" : "lab2_TAU>0&&lab1_M<200" +mDKPi+D0Kpi1+D0Kpi2+life+lab, 
-						"MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    
-    #configdict["AdditionalCuts"]["TransverseMomentum"] = {"Data": "lab0_PT> 1500 && lab0_PT<40000", "MC" : "lab0_PT>1500 && lab0_PT<40000"}
-    #configdict["AdditionalCuts"]["MomentumBachelor"] = {"Data": "lab1_P<150000", "MC" : "lab1_P<150000"}
-    #configdict["AdditionalCuts"]["Eta"] = {"Data": "lab0_ETA>2 && lab0_ETA>2", "MC" : "lab0_ETA>2 && lab0_ETA<5"}
-
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                              
-    # order of particles: KKPi, KPiPi, PiPiPi                                                                                                         
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"} #lab3 = K, lab4, lab5 = pi
-
-    # weighting templates by PID eff/misID, apply shifts to templates
-    configdict["WeightingMassTemplates"] = {"PIDBachEff":    { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                               "Var":["nTracks","lab1_P"], "HistName":"MyPionEff_0_mu2"},
-                                            "PIDBachMisID":  { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012"},
-                                                               "Var":["nTracks","lab1_P"], "HistName":"MyKaonMisID_0_mu2"},
-                                            "RatioDataMC":   { "FileLabel": {"2011":"#RatioDataMC 2011 PNTr", 
-                                                                             "2012":"#RatioDataMC 2012 PNTr"}, #filtered for signal!, not filtered for bkg
-                                                               "Var":["lab1_P","nTracks"], "HistName":"histRatio"},
-                                            "Shift":{ "BeautyMass": 2.5, "CharmMass": 0.0} }
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    # Bs signal shapes 
-    #configdict["BsSignalShape"] = {} 
-    #configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    #configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5280.0},    "Fixed": False}
-    #configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"KPiPi":17.918},  "Fixed": True} 
-    #configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"KPiPi":11.882},  "Fixed": True} 
-    #configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"KPiPi":-2.0221},  "Fixed": True}
-    #configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"KPiPi":1.6922}, "Fixed": True}
-    #configdict["BsSignalShape"]["n1"]      = {"Run1": {"KPiPi":3.2641},  "Fixed": True}
-    #configdict["BsSignalShape"]["n2"]      = {"Run1": {"KPiPi":1.2653},  "Fixed": True}
-    #configdict["BsSignalShape"]["frac"]    = {"Run1": {"KPiPi":0.5}, "Fixed": True}
-    #configdict["BsSignalShape"]["R"]       = {"Run1": {"KPiPi":1.0},     "Fixed": False}
-
-    # Bd signal shape Ipatia+JohnsonSU
-    configdict["BsSignalShape"] = {} 
-    configdict["BsSignalShape"]["type"]         = "IpatiaPlusJohnsonSU"
-    configdict["BsSignalShape"]["mean"]         = {"Run1": {"All":5280.0},     "Fixed": False}
-    configdict["BsSignalShape"]["l"]            = {"Run1": {"KPiPi":-0.9997},  "Fixed": True} 
-    configdict["BsSignalShape"]["zeta"]         = {"Run1": {"KPiPi":0.0},      "Fixed": True} 
-    configdict["BsSignalShape"]["fb"]           = {"Run1": {"KPiPi":0.0},      "Fixed": True}
-    configdict["BsSignalShape"]["nu"]           = {"Run1": {"KPiPi":-0.12999}, "Fixed": True}
-    configdict["BsSignalShape"]["tau"]          = {"Run1": {"KPiPi":0.4273},   "Fixed": True}
-   # configdict["BsSignalShape"]["shift"]        = {"Run1": {"KPiPi":1.2653},  "Fixed": True}
-   # configdict["BsSignalShape"]["meanShift"]    = {"Run1": {"KPiPi":0.5},     "Fixed": False}
-    configdict["BsSignalShape"]["sigmaI"]       = {"Run1": {"KPiPi":22.355},    "Fixed": True}
-    configdict["BsSignalShape"]["sigmaJ"]       = {"Run1": {"KPiPi":15.695},    "Fixed": True}
-    configdict["BsSignalShape"]["a1"]           = {"Run1": {"KPiPi":0.5586},    "Fixed": True}    
-    configdict["BsSignalShape"]["a2"]           = {"Run1": {"KPiPi":5.6699},    "Fixed": True}
-    configdict["BsSignalShape"]["n1"]           = {"Run1": {"KPiPi":1.5866},    "Fixed": True}
-    configdict["BsSignalShape"]["n2"]           = {"Run1": {"KPiPi":1.7686},    "Fixed": True}
-   # configdict["BsSignalShape"]["scalea"]       = {"Run1": {"KPiPi":1.0},      "Fixed": True}    
-   # configdict["BsSignalShape"]["scalen"]       = {"Run1": {"KPiPi":1.0},      "Fixed": True}
-    configdict["BsSignalShape"]["frac"]         = {"Run1": {"KPiPi":0.16119},   "Fixed": True}
-
-
-
-
-
-    # Ds signal shapes  
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1869.8},       "Fixed": False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"KPiPi":11.501},     "Fixed": False}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"KPiPi":6.1237},     "Fixed": False}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"KPiPi":1.6382},     "Fixed": False}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"KPiPi":-3.4683},    "Fixed": False}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"KPiPi":4.8678},     "Fixed": False}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"KPiPi":4.3285e-06}, "Fixed": False}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"KPiPi":0.38916},    "Fixed": False}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"KPiPi":1.0 },       "Fixed": False}
-
-    # combinatorial background                                                                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"KPiPi":-1.0361e-03}, "Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"KPiPi":-0.01},       "Fixed": False}
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"KPiPi":0.5},         "Fixed": False}
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusDoubleCrystalBallWithWidthRatioSharedMean"
-    configdict["DsCombinatorialShape"]["sigma1"]  = {"Run1": {"KPiPi":11.501},          "Fixed":False}
-    configdict["DsCombinatorialShape"]["sigma2"]  = {"Run1": {"KPiPi":6.1237},          "Fixed":False}
-    configdict["DsCombinatorialShape"]["alpha1"]  = {"Run1": {"KPiPi":1.6382},          "Fixed":False}
-    configdict["DsCombinatorialShape"]["alpha2"]  = {"Run1": {"KPiPi":-3.4683},         "Fixed":False}
-    configdict["DsCombinatorialShape"]["n1"]      = {"Run1": {"KPiPi":4.8678},          "Fixed":False}
-    configdict["DsCombinatorialShape"]["n2"]      = {"Run1": {"KPiPi":4.3285e-06},      "Fixed":False}
-    configdict["DsCombinatorialShape"]["frac"]    = {"Run1": {"KPiPi":0.38916},         "Fixed":False}
-    configdict["DsCombinatorialShape"]["R"]       = {"Run1": {"KPiPi":1.5},             "Fixed":False}
-    configdict["DsCombinatorialShape"]["cB"]      = {"Run1": {"KPiPi":-1.9193e-03},     "Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"KPiPi":0.5},             "Fixed":False}
-
-    #modelling two-horned shape 
-    #configdict["BeautyMassBd2DstPiShape"] = {}
-    #configdict["BeautyMassBd2DstPiShape"]["type"]  = "DoubleGaussianSeparatedMean"
-    #configdict["BeautyMassBd2DstPiShape"]["sigma1"]  = {"Run1": {"KPiPi":15.0},          "Fixed":False}
-    #configdict["BeautyMassBd2DstPiShape"]["sigma2"]  = {"Run1": {"KPiPi":15.0},          "Fixed":False}
-    #configdict["BeautyMassBd2DstPiShape"]["mean"]    = {"Run1": {"KPiPi":5030.0},        "Fixed":False}
-    #configdict["BeautyMassBd2DstPiShape"]["mean2"]   = {"Run1": {"KPiPi":5110.0},        "Fixed":False}
-    #configdict["BeautyMassBd2DstPiShape"]["frac"]   = {"Run1": {"KPiPi":0.5},        "Fixed":False} 
-
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed": False} 
-    configdict["AdditionalParameters"]["g1_f2_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed": False}
-
-    #expected yields (Bs2DsPi & Lb2LcPi fixed)
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bd2DK"]     = {"2011": {"KPiPi":15000.0},  "2012": {"KPiPi":30000.0},  "Fixed": False}
-    configdict["Yields"]["Bd2DRho"]   = {"2011": {"KPiPi":80000.0},  "2012": {"KPiPi":160000.0}, "Fixed": False}
-    configdict["Yields"]["Bd2DstPi"]  = {"2011": {"KPiPi":60000.0},  "2012": {"KPiPi":120000.0}, "Fixed": False}
-    configdict["Yields"]["Bs2DsPi"]   = {"2011": {"KPiPi":1000.0},   "2012": {"KPiPi":2000.0},   "Fixed": True}
-    configdict["Yields"]["Lb2LcPi"]   = {"2011": {"KPiPi":250.0},    "2012": {"KPiPi":500.0},    "Fixed": True}
-    configdict["Yields"]["CombBkg"]   = {"2011": {"KPiPi":30000.0},  "2012": {"KPiPi":60000.0},  "Fixed": False}
-    configdict["Yields"]["Signal"]    = {"2011": {"KPiPi":150000.0}, "2012": {"KPiPi":300000.0}, "Fixed": False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bd2DK", "Lb2LcPi", "Bs2DsPi", "Bd2DRho", "Bd2DstPi"] 
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kRed, kBlue-10, kYellow, kBlue+2]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.55, 0.90, 0.91], "TextSize": 0.04, "LHCbText":[0.35,0.9], "ScaleYSize":1.2}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.7, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":1.2}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/fsfd_5fb/Bd2DPi/Bd2DPiConfigForNominalMassFit_5200.py b/PhysFit/B2DXFitters/data/fsfd_5fb/Bd2DPi/Bd2DPiConfigForNominalMassFit_5200.py
deleted file mode 100644
index 661c415974251f7b9c01d2326099c34377c9b501..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/fsfd_5fb/Bd2DPi/Bd2DPiConfigForNominalMassFit_5200.py
+++ /dev/null
@@ -1,149 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bd2DPi"
-    configdict["CharmModes"] = {"KPiPi"}
-    configdict["Backgrounds"] = ["Bd2DK","Bd2DRho","Bd2DstPi","Lb2LcPi","Bs2DsPi"]
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2012"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2011":"21r1", "2012":"21"}  # , "2011":"21r1"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                  
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.56, "Up": 0.42}, "2012":{"Down": 0.9912, "Up": 0.9988}}  #"2011": {"Down":  0.56, "Up": 0.42}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/fsfd_5fb/Bd2DPi/config_Bd2DPi.txt" 
-    #settings for control plots
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBd2DPi", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5200,    5800    ], "InputName" : "lab0_MassFitConsD_M"} #data 5000-5800, then you can change to whatever you want 
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1830,    1920    ], "InputName" : "lab2_MM"}  # data 1830 - 1920, 
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-7.0,    6.0     ], "InputName" : "lab1_PIDK"}
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [0.1,     1.0     ], "InputName" : "BDTGResponse_3"} 
-
-    #additional cuts applied to data sets
-    lab = "&& lab1_M<200 && lab3_M > 200 && lab4_M < 200 && lab5_M <200" 
-    mDKPi = "&&(lab2_MM-lab34_MM > 200) && (lab2_MM-lab35_MM > 200)"
-    D0Kpi1 = "&&!(abs(sqrt(pow(sqrt(pow(493.67,2)+pow(lab1_P,2))+sqrt(pow(lab5_M,2)+pow(lab5_P,2)),2)-pow(lab1_PX+lab5_PX,2)-pow(lab1_PY+lab5_PY,2)-pow(lab1_PZ+lab5_PZ,2))-1870)<20)"
-    D0Kpi2 = "&&!(abs(sqrt(pow(sqrt(pow(493.67,2)+pow(lab1_P,2))+sqrt(pow(lab4_M,2)+pow(lab4_P,2)),2)-pow(lab1_PX+lab4_PX,2)-pow(lab1_PY+lab4_PY,2)-pow(lab1_PZ+lab4_PZ,2))-1870)<20)"
-    life = "&&lab2_TAU>0&&lab2_FD_ORIVX > 0."
-    veto_lb1 = "&&!(fabs(lab2_MassHypo_Lambda_pi1 - 2286.4) < 30. && lab4_PIDp > 0)"
-    veto_lb2 = "&&!(fabs(lab2_MassHypo_Lambda_pi2 - 2286.4) < 30. && lab5_PIDp > 0)"
-    veto_dspi1 = "&&((lab2_MassHypo_Ds_pi1 < 1949. || lab2_MassHypo_Ds_pi1 > 2029. || lab4_PIDK < 0.))"
-    veto_dspi2 = "&&((lab2_MassHypo_Ds_pi2 < 1949. || lab2_MassHypo_Ds_pi2 > 2029. || lab5_PIDK < 0.))"
-    # additional cuts applied to data sets                                                                                    
-    HLTcut = "(lab0_Hlt1TrackAllL0Decision_TOS == 1 && (lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo4BodyBBDTDecision_TOS == 1) && (lab0_L0HadronDecision_TOS || lab0_L0Global_TIS ==1))";
-
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab1_PIDK<0&&lab2_TAU>0&&lab1_PIDmu<2" +mDKPi+D0Kpi1+D0Kpi2+life+veto_lb1+veto_lb2+veto_dspi1+veto_dspi2+lab, 
-						"MC" : "lab2_TAU>0&&lab1_M<200" +mDKPi+D0Kpi1+D0Kpi2+life+lab, 
-						"MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    
-    #configdict["AdditionalCuts"]["TransverseMomentum"] = {"Data": "lab0_PT> 1500 && lab0_PT<40000", "MC" : "lab0_PT>1500 && lab0_PT<40000"}
-    #configdict["AdditionalCuts"]["MomentumBachelor"] = {"Data": "lab1_P<150000", "MC" : "lab1_P<150000"}
-    #configdict["AdditionalCuts"]["Eta"] = {"Data": "lab0_ETA>2 && lab0_ETA>2", "MC" : "lab0_ETA>2 && lab0_ETA<5"}
-
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                              
-    # order of particles: KKPi, KPiPi, PiPiPi                                                                                                         
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"} #lab3 = K, lab4, lab5 = pi
-
-    # weighting templates by PID eff/misID, apply shifts to templates
-    configdict["WeightingMassTemplates"] = {"PIDBachEff":    { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"},
-                                                               "Var":["nTracks","lab1_P"], "HistName":"MyPionEff_0_mu2"},
-                                            "PIDBachMisID":  { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012"},
-                                                               "Var":["nTracks","lab1_P"], "HistName":"MyKaonMisID_0_mu2"},
-                                            "RatioDataMC":   { "FileLabel": {"2011":"#RatioDataMC 2011 PNTr", 
-                                                                             "2012":"#RatioDataMC 2012 PNTr"}, #filtered for signal!, not filtered for bkg
-                                                               "Var":["lab1_P","nTracks"], "HistName":"histRatio"},
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    # Bs signal shapes 
-    configdict["BsSignalShape"] = {} 
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5280.0},    "Fixed": False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"KPiPi":17.918},  "Fixed": True} 
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"KPiPi":11.882},  "Fixed": True} 
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"KPiPi":-2.0221},  "Fixed": True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"KPiPi":1.6922}, "Fixed": True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"KPiPi":3.2641},  "Fixed": True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"KPiPi":1.2653},  "Fixed": True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"KPiPi":0.5}, "Fixed": True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"KPiPi":1.0},     "Fixed": False}
-
-    # Ds signal shapes  
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1869.8},       "Fixed": False}
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"KPiPi":11.501},     "Fixed": False}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"KPiPi":6.1237},     "Fixed": False}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"KPiPi":1.6382},     "Fixed": False}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"KPiPi":-3.4683},    "Fixed": False}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"KPiPi":4.8678},     "Fixed": False}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"KPiPi":4.3285e-06}, "Fixed": False}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"KPiPi":0.38916},    "Fixed": False}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"KPiPi":1.0 },       "Fixed": False}
-
-    # combinatorial background                                                                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"KPiPi":-1.0361e-03}, "Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"KPiPi":-0.01},       "Fixed": False}
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"KPiPi":0.5},         "Fixed": False}
-
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusDoubleCrystalBallWithWidthRatioSharedMean"
-    configdict["DsCombinatorialShape"]["sigma1"]  = {"Run1": {"KPiPi":11.501},          "Fixed":False}
-    configdict["DsCombinatorialShape"]["sigma2"]  = {"Run1": {"KPiPi":6.1237},          "Fixed":False}
-    configdict["DsCombinatorialShape"]["alpha1"]  = {"Run1": {"KPiPi":1.6382},          "Fixed":False}
-    configdict["DsCombinatorialShape"]["alpha2"]  = {"Run1": {"KPiPi":-3.4683},         "Fixed":False}
-    configdict["DsCombinatorialShape"]["n1"]      = {"Run1": {"KPiPi":4.8678},          "Fixed":False}
-    configdict["DsCombinatorialShape"]["n2"]      = {"Run1": {"KPiPi":4.3285e-06},      "Fixed":False}
-    configdict["DsCombinatorialShape"]["frac"]    = {"Run1": {"KPiPi":0.38916},         "Fixed":False}
-    configdict["DsCombinatorialShape"]["R"]       = {"Run1": {"KPiPi":1.5},             "Fixed":False}
-    configdict["DsCombinatorialShape"]["cB"]      = {"Run1": {"KPiPi":-1.9193e-03},     "Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"KPiPi":0.5},             "Fixed":False}
-
-
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed": False} 
-    configdict["AdditionalParameters"]["g1_f2_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed": False}
-
-    #expected yields (Bs2DsPi & Lb2LcPi fixed)
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bd2DK"]     = {"2011": {"KPiPi":15000.0},  "2012": {"KPiPi":30000.0},  "Fixed": False}
-    configdict["Yields"]["Bd2DRho"]   = {"2011": {"KPiPi":80000.0},  "2012": {"KPiPi":160000.0}, "Fixed": False}
-    configdict["Yields"]["Bd2DstPi"]  = {"2011": {"KPiPi":60000.0},  "2012": {"KPiPi":120000.0}, "Fixed": False}
-    configdict["Yields"]["Bs2DsPi"]   = {"2011": {"KPiPi":1000.0},   "2012": {"KPiPi":2000.0},   "Fixed": False}
-    configdict["Yields"]["Lb2LcPi"]   = {"2011": {"KPiPi":250.0},    "2012": {"KPiPi":500.0},    "Fixed": False}
-    configdict["Yields"]["CombBkg"]   = {"2011": {"KPiPi":30000.0},  "2012": {"KPiPi":60000.0},  "Fixed": False}
-    configdict["Yields"]["Signal"]    = {"2011": {"KPiPi":150000.0}, "2012": {"KPiPi":300000.0}, "Fixed": False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bd2DK", "Lb2LcPi", "Bs2DsPi", "Bd2DRho", "Bd2DstPi"] 
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kRed, kBlue-10, kYellow, kBlue+2]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.55, 0.90, 0.91], "TextSize": 0.04, "LHCbText":[0.35,0.9], "ScaleYSize":1.2}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.7, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":1.2}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/fsfd_5fb/Bd2DPi/config_Bd2DPi.txt b/PhysFit/B2DXFitters/data/fsfd_5fb/Bd2DPi/config_Bd2DPi.txt
deleted file mode 100644
index 9e62fb2343a6ff34b5959bfdd192451e9ece1c87..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/fsfd_5fb/Bd2DPi/config_Bd2DPi.txt
+++ /dev/null
@@ -1,162 +0,0 @@
-#Bd2DPi KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bd_Dpi_2011_Dw.root
-Bd_Dpi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bd2DPi KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/user/a/adudziak/fsfd/2016/BDTG/MERGED/
-Data_2016_up_MINI_BDTG_Bd.root
-Data_2016_up_MINI_BDTG_Bd.root
-DecayTree
-DecayTree
-###
-
-#Bd2DPi KPiPi 2012  usarEsse2012
-root://eoslhcb.cern.ch//eos/lhcb/user/m/mvitti/B2DK_rootFiles/Data/
-Data_2012_dw_MINI_BDTG3_Bd.root
-Data_2012_up_MINI_BDTG3_Bd.root
-DecayTree
-DecayTree
-###
-
-#Bd2DPi KPiPi 2012 blablabla
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bd_Dpi_2012_Dw.root
-Bd_Dpi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Signal Bd2DPi KPiPi 2011 blabla
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG3_Bd.root
-B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG3_Bd.root
-DecayTree
-DecayTree
-###
-
-#Signal Bd2DPi KPiPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC_Filtered/FINAL/
-B2DX_MC_Bd_D-pi+_Kpipi_CPV_2012_Dn_BDTG3_Bd.root
-B2DX_MC_Bd_D-pi+_Kpipi_CPV_2012_Up_BDTG3_Bd.root
-DecayTree
-DecayTree
-###
-
-#MC FileName KPiPi MD 2011
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-K+_Dn_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dspi_KKpi_Dn_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Dn_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-rho+_Dn_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_Dst-pi+_D-pi0_Dn_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KPiPi MU 2011
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-K+_Up_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dspi_KKpi_Up_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Up_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-rho+_Up_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_Dst-pi+_D-pi0_Up_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KPiPi MD 2012
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-K+_Dn_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dspi_KKpi_Dn_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Dn_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-rho+_Dn_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_Dst-pi+_D-pi0_Dn_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KPiPi MU 2012
-{"Mode":"Bd2DK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-K+_Up_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dspi_KKpi_Up_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Up_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-rho+_Up_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_Dst-pi+_D-pi0_Up_BDTG3_Bd.root",
- "TreeName":"DecayTree"}
-###
-
-
-#PIDK Pion 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21r1_2011_MagDown_nTracks_P.root
-Pi_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Pion 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21_2012_MagDown_nTracks_P.root
-Pi_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21r1_2011_MagDown_nTracks_P.root
-K_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21_2012_MagDown_nTracks_P.root
-K_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#RatioDataMC 2011 PNTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PNTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-#RatioDataMC 2012 PNTr Filtered
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/filtered/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
diff --git a/PhysFit/B2DXFitters/data/fsfd_5fb/Bs2DsPi/Bs2DsPiConfigForNominalMassFit.py b/PhysFit/B2DXFitters/data/fsfd_5fb/Bs2DsPi/Bs2DsPiConfigForNominalMassFit.py
deleted file mode 100644
index e6fe3764951bc1e960967ba135133c9cee6d027c..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/fsfd_5fb/Bs2DsPi/Bs2DsPiConfigForNominalMassFit.py
+++ /dev/null
@@ -1,166 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-    
-    from math import pi
-    from math import log
-
-    # considered decay mode                                                       
-    configdict["Decay"] = "Bs2DsPi"
-    configdict["CharmModes"] = {"KKPi"}
-    configdict["Backgrounds"] = ["Bd2DPi","Lb2LcPi","Bs2DsRho","Bs2DsstPi","Bd2DsPi","Bs2DsK"]
-    # year of data taking                                                                                                                          
-    configdict["YearOfDataTaking"] = {"2012"}
-    # stripping (necessary in case of PIDK shapes)                                                                                              
-    configdict["Stripping"] = {"2011":"21r1", "2012":"21"}
-    # integrated luminosity in each year of data taking (necessary in case of PIDK shapes)                                                                 
-    configdict["IntegratedLuminosity"] = {"2011": {"Down":  0.56, "Up": 0.42}, "2012":{"Down": 0.9912, "Up": 0.9988}}
-    # file name with paths to MC/data samples                                                                                                       
-    configdict["dataName"]   = "../data/fsfd_5fb/Bs2DsPi/config_Bs2DsPi_newBDTG.txt"
-    #settings for control plots                                                                                                                                                           
-    configdict["ControlPlots"] = {}
-    configdict["ControlPlots"] = { "Directory": "PlotBs2DsPi_Nominal", "Extension":"pdf"}
-
-    # basic variables                                                                                        
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [5300,    5800    ], "InputName" : "lab0_MassFitConsD_M"}
-    configdict["BasicVariables"]["CharmMass"]     = { "Range" : [1930,    2015    ], "InputName" : "lab2_MM"}
-    configdict["BasicVariables"]["BacPIDK"]       = { "Range" : [-200.0,    0.0     ], "InputName" : "lab1_PIDK"} #-7.0,6.0
-    configdict["BasicVariables"]["BDTG"]          = { "Range" : [ 0.1,    1.0     ], "InputName" : "BDTGResponse_3"}
-
-
-    HLTcut = "&&(lab0_Hlt1TrackAllL0Decision_TOS == 1 && (lab0_Hlt2Topo2BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo3BodyBBDTDecision_TOS == 1 || lab0_Hlt2Topo4BodyBBDTDecision_TOS == 1) && (lab0_L0HadronDecision_TOS || lab0_L0Global_TIS ==1))"
-    # additional cuts applied to data sets                                                                                    
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["All"]    = { "Data": "lab2_TAU>0&&lab1_PIDmu<2"+HLTcut,        
-                                               "MC" : "lab2_TAU>0&&lab1_M<200&&lab1_PIDK !=-1000.0"+HLTcut, "MCID":True, "MCTRUEID":True, "BKGCAT":True, "DsHypo":True}
-    configdict["AdditionalCuts"]["KKPi"]   = { "Data": "lab2_FDCHI2_ORIVX > 2", "MC" : "lab2_FDCHI2_ORIVX > 2"}
-    configdict["AdditionalCuts"]["KPiPi"]  = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"]["PiPiPi"] = { "Data": "lab2_FDCHI2_ORIVX > 9", "MC" : "lab2_FDCHI2_ORIVX > 9"}
-    configdict["AdditionalCuts"] = {}
-    configdict["AdditionalCuts"]["TransverseMomentum"] = {"Data": "lab0_PT> 1500 && lab0_PT<40000", "MC" : "lab0_PT>1500 && lab0_PT<40000"}
-    configdict["AdditionalCuts"]["MomentumBachelor"] = {"Data": "lab1_P<150000", "MC" : "lab1_P<150000"}
-    # children prefixes used in MCID, MCTRUEID, BKGCAT cuts                                                                                                              
-    # order of particles: KKPi, KPiPi, PiPiPi                                                                                                         
-    configdict["DsChildrenPrefix"] = {"Child1":"lab3","Child2":"lab4","Child3": "lab5"}
-
-
-    #weighting templates by PID eff/misID                                                                                                                                                 
-    configdict["WeightingMassTemplates"]= { "PIDBachEff":            { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"}, 
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyPionEff_0_mu2"},
-                                            "PIDBachMisID":          { "FileLabel": { "2011":"#PIDK Kaon 2011", "2012":"#PIDK Kaon 2012"}, 
-                                                                       "Var":["nTracks","lab1_P"], "HistName":"MyKaonMisID_0_mu2"},
-                                            "PIDChildKaonPionMisID": { "FileLabel": { "2011":"#PIDK Pion 2011", "2012":"#PIDK Pion 2012"}, 
-                                                                       "Var":["nTracks","lab3_P"], "HistName":"MyPionMisID_5"}, 
-                                            "Pidchildprotonmisid":   { "FileLabel": { "2011":"#PIDK Proton 2011", "2012":"#PIDK Proton 2012"}, 
-                                                                       "Var":["nTracks","lab4_P"], "HistName":"MyProtonMisID_pKm5_KPi5"}, 
-                                            "RatioDataMC":{ "FileLabel": {"2011":"#RatioDataMC 2011 PNTr", "2012": "#RatioDataMC 2011 PNTr"}, 
-                                                            "Var":["lab1_P","nTracks"], "HistName":"histRatio"},   
-                                            "Shift":{ "BeautyMass": -2.0, "CharmMass": 0.0} }
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    ###                                                               MDfit fitting settings
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#
-    
-    # Bs signal shapes                                                                                                                                   
-    configdict["BsSignalShape"] = {}
-    configdict["BsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["BsSignalShape"]["mean"]    = {"Run1": {"All":5367.51}, "Fixed":False}
-    configdict["BsSignalShape"]["sigma1"]  = {"Run1": {"KKPi" : 17.4755,   "PhiPi" : 18.3892,   "KstK" : 12.392,    },  "Fixed" : True}
-    configdict["BsSignalShape"]["sigma2"]  = {"Run1": {"KKPi" : 11.5424,   "PhiPi" : 11.4315,   "KstK" : 16.0298,   },  "Fixed" : True}
-    configdict["BsSignalShape"]["alpha1"]  = {"Run1": {"KKPi" : -2.18147,  "PhiPi" : -2.18571,  "KstK" : -1.83432,  },  "Fixed" : True}
-    configdict["BsSignalShape"]["alpha2"]  = {"Run1": {"KKPi" : 2.15494,   "PhiPi" : 2.24804,   "KstK" : 1.25656,   },  "Fixed" : True}
-    configdict["BsSignalShape"]["n1"]      = {"Run1": {"KKPi" : 2.53609,   "PhiPi" : 2.36718,   "KstK" : 2.82347,   },  "Fixed" : True}
-    configdict["BsSignalShape"]["n2"]      = {"Run1": {"KKPi" : 0.518479,  "PhiPi" : 0.410215,  "KstK" : 5.16839,   },  "Fixed" : True}
-    configdict["BsSignalShape"]["frac"]    = {"Run1": {"KKPi":0.5,         "PhiPi":0.5,         "KstK":0.5,         },  "Fixed" : True}
-    configdict["BsSignalShape"]["R"]       = {"Run1": {"KKPi":1.00,        "PhiPi":1.0,          "Kstk":1.0,        },  "Fixed" : False}
-
-    #Ds signal shapes                                                                                                                                       
-    configdict["DsSignalShape"] = {}
-    configdict["DsSignalShape"]["type"]    = "DoubleCrystalBallWithWidthRatio"
-    configdict["DsSignalShape"]["mean"]    = {"Run1": {"All":1968.49}, "Fixed":False} 
-    configdict["DsSignalShape"]["sigma1"]  = {"Run1": {"KKPi" : 5.94251,   "PhiPi" : 5.37138,   "KstK" : 5.63019,   },  "Fixed" : True}
-    configdict["DsSignalShape"]["sigma2"]  = {"Run1": {"KKPi" : 5.50472,   "PhiPi" : 5.89377,   "KstK" : 6.17574,   },  "Fixed" : True}
-    configdict["DsSignalShape"]["alpha1"]  = {"Run1": {"KKPi" : -1.1612,   "PhiPi" : -1.1131,   "KstK" : -1.18225,  },  "Fixed" : True}
-    configdict["DsSignalShape"]["alpha2"]  = {"Run1": {"KKPi" : 1.2832,    "PhiPi" : 1.14251,   "KstK" : 1.26344,   },  "Fixed" : True}
-    configdict["DsSignalShape"]["n1"]      = {"Run1": {"KKPi" : 16.048,    "PhiPi" : 8.68961,   "KstK" : 11.378,    },  "Fixed" : True}
-    configdict["DsSignalShape"]["n2"]      = {"Run1": {"KKPi" : 3.68624,   "PhiPi" : 5.8552,    "KstK" : 5.88566,   },  "Fixed" : True}
-    configdict["DsSignalShape"]["frac"]    = {"Run1": {"KKPi":0.50,        "PhiPi":0.50,        "KstK":0.50,        },  "Fixed" : True}
-    configdict["DsSignalShape"]["R"]       = {"Run1": {"KKPi":1.00,        "PhiPi":1.00,        "KstK":1.00,        },  "Fixed" : False}
-
-    # combinatorial background                                                                                                                              
-    configdict["BsCombinatorialShape"] = {}
-    configdict["BsCombinatorialShape"]["type"]  = "DoubleExponential"
-    configdict["BsCombinatorialShape"]["cB1"]   = {"Run1": {"KKPi":-3.5211e-02,  "PhiPi":-3.0873e-02,  "KstK":-2.3392e-02 }, "Fixed": False}
-    configdict["BsCombinatorialShape"]["cB2"]   = {"Run1": {"KKPi":0.0,          "PhiPi":0.0,          "KstK":0.0},          "Fixed": True }
-    configdict["BsCombinatorialShape"]["frac"]  = {"Run1": {"KKPi":4.3067e-01,   "PhiPi":6.5400e-01,   "KstK":3.7409e-01,},  "Fixed": False}
-    
-    configdict["DsCombinatorialShape"] = {}
-    configdict["DsCombinatorialShape"]["type"]  = "ExponentialPlusSignal" #"ExponentialPlusDoubleCrystalBallWithWidthRatioSharedMean"
-    configdict["DsCombinatorialShape"]["sigma1"]  = {"Run1": {"KKPi":5.2639e+00,  "PhiPi":5.7789e+00,  "KstK":5.5277e+00},  "Fixed":True}
-    configdict["DsCombinatorialShape"]["sigma2"]  = {"Run1": {"KKPi":5.7588e+00,  "PhiPi":5.3142e+00,  "KstK":5.9173e+00},  "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha1"]  = {"Run1": {"KKPi":-1.1429e+00, "PhiPi":-1.0496e+00, "KstK":-1.1662e+00}, "Fixed":True}
-    configdict["DsCombinatorialShape"]["alpha2"]  = {"Run1": {"KKPi":1.1400e+00,  "PhiPi":1.1819e+00,  "KstK":1.1958e+00},  "Fixed":True}
-    configdict["DsCombinatorialShape"]["n1"]      = {"Run1": {"KKPi":1.1892e+01,  "PhiPi":4.9291e+01,  "KstK":1.7661e+01},  "Fixed":True}
-    configdict["DsCombinatorialShape"]["n2"]      = {"Run1": {"KKPi":7.6655e+00,  "PhiPi":4.9162e+00,  "KstK":9.4543e+00},  "Fixed":True}
-    configdict["DsCombinatorialShape"]["frac"]    = {"Run1": {"KKPi":0.50,        "PhiPi":0.50,        "KstK":0.50},        "Fixed":True}
-    configdict["DsCombinatorialShape"]["R"]       = {"Run1": {"KKPi":1.00,        "PhiPi":1.5,         "Kstk":1.5},         "Fixed":False}
-    configdict["DsCombinatorialShape"]["cD"]      = {"Run1": {"KKPi":-5.7520e-03, "PhiPi":-5.7273e-03, "KstK":-8.3967e-03}, "Fixed":False}
-    configdict["DsCombinatorialShape"]["fracD"]   = {"Run1": {"KKPi":0.88620,      "PhiPi":0.37379,    "KstK":0.59093},     "Fixed":False}
-
-    configdict["PIDKCombinatorialShape"] = {}
-    configdict["PIDKCombinatorialShape"]["type"] = "Fixed"
-    configdict["PIDKCombinatorialShape"]["components"] = { "Kaon":True, "Pion":True, "Proton":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK1"]   = { "Run1":{"KKPi":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-    configdict["PIDKCombinatorialShape"]["fracPIDK2"]   = { "Run1":{"KKPi":0.9, "PhiPi":0.9, "KstK":0.9, "KPiPi":0.8, "PiPiPi":0.8 }, "Fixed":False }
-
-
-    #Bd2Dsh background
-    #shape for BeautyMass, for CharmMass as well as BacPIDK taken by default the same as signal 
-    configdict["Bd2DsPiShape"] = {}
-    configdict["Bd2DsPiShape"]["BeautyMass"] = {}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["type"]    = "ShiftedSignal"
-    configdict["Bd2DsPiShape"]["BeautyMass"]["shift"]   = {"Run1": {"All": 86.8}, "Fixed":True}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["scale1"]  = {"Run1": {"All": 1.00808721452}, "Fixed":True}
-    configdict["Bd2DsPiShape"]["BeautyMass"]["scale2"]  = {"Run1": {"All": 1.03868673310}, "Fixed":True}
-
-    #
-    configdict["AdditionalParameters"] = {}
-    configdict["AdditionalParameters"]["g1_f1_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-    configdict["AdditionalParameters"]["g1_f2_frac"] = {"Run1":{"All":{"Both":{"CentralValue":0.5, "Range":[0.0,1.0]}}}, "Fixed":False}
-
-
-    #expected yields                                                                                                                                                       
-    configdict["Yields"] = {}
-    configdict["Yields"]["Bd2DsPi"]         = {"2011": { "KKPi":400.0,   "PhiPi":500.0,   "KstK":500.0},
-                                               "2012": { "KKPi":400.0,   "PhiPi":500.0,   "KstK":500.0},  "Fixed":False}
-    configdict["Yields"]["Bd2DPi"]          = {"2011": { "KKPi":50.4,    "PhiPi":3.5,     "KstK":10.3},
-                                               "2012": { "KKPi":150.9,   "PhiPi":7.8,     "KstK":21.4},  "Fixed":True}
-    configdict["Yields"]["Lb2LcPi"]         = {"2011": { "KKPi":140.4,   "PhiPi":30.7,    "KstK":46.2},
-                                               "2012": { "KKPi":482.4,   "PhiPi":64.7,    "KstK":108.0},  "Fixed":True}
-    configdict["Yields"]["Bs2DsK"]          = {"2011": { "KKPi":30.5,    "PhiPi":77.8,    "KstK":41.6},
-                                               "2012": { "KKPi":116.2,    "PhiPi":184.1,   "KstK":121.0}, "Fixed":True}
-    configdict["Yields"]["Bs2DsDsstPiRho"]  = {"2011": { "KKPi":10000.0, "PhiPi":10000.0, "KstK":10000.0},
-                                               "2012": { "KKPi":20000.0, "PhiPi":20000.0, "KstK":20000.0}, "Fixed":False}
-    configdict["Yields"]["CombBkg"]         = {"2011": { "KKPi":10000.0, "PhiPi":10000.0, "KstK":10000.0},
-                                               "2012": { "KKPi":50000.0, "PhiPi":20000.0, "KstK":20000.0},"Fixed":False}
-    configdict["Yields"]["Signal"]          = {"2011": { "KKPi":10000.0, "PhiPi":10000.0, "KstK":10000.0},
-                                               "2012": { "KKPi":100000.0, "PhiPi":20000.0, "KstK":20000.0},"Fixed":False}
-
-
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#    
-    ###                                                               MDfit plotting settings                                                             
-    #----------------------------------------------------------------------------------------------------------------------------------------------------------------#               
-    from ROOT import *
-    configdict["PlotSettings"] = {}
-    configdict["PlotSettings"]["components"] = ["Sig", "CombBkg", "Bd2DPi", "Lb2LcPi", "Bs2DsDsstPiRho", "Bs2DsK", "Bd2DsPi"] 
-    configdict["PlotSettings"]["colors"] = [kRed-7, kBlue-6, kOrange, kRed, kBlue-10, kGreen+3, kMagenta+2]
-
-    configdict["LegendSettings"] = {}
-    configdict["LegendSettings"]["BeautyMass"] = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.35,0.9], "ScaleYSize":1.2}
-    configdict["LegendSettings"]["CharmMass"]  = {"Position":[0.20, 0.69, 0.93, 0.93], "TextSize": 0.05, "LHCbText":[0.8,0.66],
-                                                  "ScaleYSize":1.7, "SetLegendColumns":2, "LHCbTextSize":0.075 }
-    configdict["LegendSettings"]["BacPIDK"]    = {"Position":[0.53, 0.45, 0.90, 0.91], "TextSize": 0.05, "LHCbText":[0.20,0.9], "ScaleYSize":1.2}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/fsfd_5fb/Bs2DsPi/config_Bs2DsPi_newBDTG.txt b/PhysFit/B2DXFitters/data/fsfd_5fb/Bs2DsPi/config_Bs2DsPi_newBDTG.txt
deleted file mode 100644
index bd08ebd6e6b3c82a8754daed4a8fe5cdd0c1bbd3..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/fsfd_5fb/Bs2DsPi/config_Bs2DsPi_newBDTG.txt
+++ /dev/null
@@ -1,524 +0,0 @@
-#B2DPi KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bd_Dpi_2011_Dw.root
-Bd_Dpi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#B2DPi KPiPi 2012 blabla
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bd_Dpi_2012_Dw.root
-Bd_Dpi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi NonRes 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_nonres_2011_Dw.root
-Bs_Dspi_nonres_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PhiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_phipi_2011_Dw.root
-Bs_Dspi_phipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KstK 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_KstK_2011_Dw.root
-Bs_Dspi_KstK_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_Kpipi_2011_Dw.root
-Bs_Dspi_Kpipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PiPiPi 2011
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_pipipi_2011_Dw.root
-Bs_Dspi_pipipi_2011_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi NonRes 2012 blabla
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_nonres_2012_Dw.root
-Bs_Dspi_nonres_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PhiPi 2012 blabla
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_phipi_2012_Dw.root
-Bs_Dspi_phipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KstK 2012 blabla
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_KstK_2012_Dw.root
-Bs_Dspi_KstK_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KPiPi 2012 blabla
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_Kpipi_2012_Dw.root
-Bs_Dspi_Kpipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi PiPiPi 2012 blabla
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_SCALED/MERGED_WITH_BDTG3/
-Bs_Dspi_pipipi_2012_Dw.root
-Bs_Dspi_pipipi_2012_Up.root
-DecayTree
-DecayTree
-###
-
-#Bs2DsPi KKPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/user/m/mvitti/B2DK_rootFiles/Data/
-Data_2012_dw_MINI_BDTG3_OFFLINE_Bs_Dspi_KKpi.root
-Data_2012_up_MINI_BDTG3_OFFLINE_Bs_Dspi_KKpi.root
-DecayTree
-DecayTree
-###
-
-#sWeights
-/afs/cern.ch/work/a/adudziak/public/sWeights/
-sWeights_BsDsPi_all_both.root
-sWeights_BsDsPi_all_both.root
-merged
-merged
-###
-
-#PID Pion 2012 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21_2012_MagDown_P.root
-Pi_Strip21_2012_MagUp_P.root
-###
-
-#PID Kaon 2012 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21_2012_MagDown_P.root
-K_Strip21_2012_MagUp_P.root
-###
-
-#PID ProtonXXX 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_TotLc_Strip21_2012_MagDown_P.root
-P_TotLc_Strip21_2012_MagUp_P.root
-###
-
-#PID Proton 2012 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip20_2012_MagDown_P.root
-P_Strip20_2012_MagUp_P.root
-###
-
-#PID Pion 2011 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21r1_2011_MagDown_P.root
-Pi_Strip21r1_2011_MagUp_P.root
-###
-
-#PID Kaon 2011 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21r1_2011_MagDown_P.root
-K_Strip21r1_2011_MagUp_P.root
-###
-
-#PID ProtonXXX 2011 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_TotLc_Strip21r1_2011_MagDown_P.root
-P_TotLc_Strip21r1_2011_MagUp_P.root
-###
-
-#PID Proton 2011 1D
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip20r1_2011_MagDown_P.root
-P_Strip20r1_2011_MagUp_P.root
-###
-
-
-#PIDp
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_Proton_MagDown_TightCuts.root
-EffHistos_Reco12_39Mom_Proton_MagUp_TightCuts.root
-###
-
-#PID
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_0123.root
-EffHistos_Reco12_39Mom_MagUp_012.root
-###
-
-#PIDK Pion 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21r1_2011_MagDown_nTracks_P.root
-Pi_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Pion 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-Pi_Strip21_2012_MagDown_nTracks_P.root
-Pi_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21r1_2011_MagDown_nTracks_P.root
-K_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Kaon 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-K_Strip21_2012_MagDown_nTracks_P.root
-K_Strip21_2012_MagUp_nTracks_P.root
-###
-
-#PIDK Proton 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21r1_2011_MagDown_nTracks_P.root
-P_Strip21r1_2011_MagUp_nTracks_P.root
-###
-
-#PIDK Proton 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/PIDCalib_histos/
-P_Strip21_2012_MagDown_nTracks_P.root
-P_Strip21_2012_MagUp_nTracks_P.root
-###
-
-
-#PID2
-/afs/cern.ch/user/l/lcarson/public/ForAgnieszka/
-EffHistos_Reco12_39Mom_MagDown_45678.root
-EffHistos_Reco12_39Mom_MagUp_3456.root
-###
-
-#RatioDataMC2D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-MomVsnTr_Comp_DPi_Down_hist.root
-MomVsnTr_Comp_DPi_Up_hist.root
-###
-
-
-#RatioDataMC 2011
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/
-MomVsnTr_Comp_DPi_2011_dw_hist.root
-MomVsnTr_Comp_DPi_2011_up_hist.root
-###
-
-#RatioDataMC 2012
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/
-MomVsnTr_Comp_DPi_2012_dw_hist.root
-MomVsnTr_Comp_DPi_2012_up_hist.root
-###
-
-#RatioDataMC 2011 PEta
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_eta/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PEta
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_eta/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-
-#RatioDataMC 2011 PNTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PNTr
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-
-#RatioDataMC 2011 PNTr Filtered
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/filtered/
-weights_DPi_2011_dw.root
-weights_DPi_2011_up.root
-###
-
-#RatioDataMC 2012 PNTr Filtered
-/afs/cern.ch/work/s/sgallori/public/forAgnieszka/dataMC_weights/p_nTracks/filtered/
-weights_DPi_2012_dw.root
-weights_DPi_2012_up.root
-###
-
-
-#RatioDataMC3D
-/afs/cern.ch/work/a/adudziak/public/workspace/
-PtVsnTrVsP_Comp_DPi_Down_hist.root
-PtVsnTrVsP_Comp_DPi_Up_hist.root
-###
-
-#MC FileName KKPi MD 2011
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsrho_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstpi_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstrho_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_DsK_KKpi_CPV_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MU 2011
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsrho_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstpi_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstrho_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_DsK_KKpi_CPV_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MD 2012
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsrho_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstpi_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstrho_KKpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_DsK_KKpi_CPV_Dn_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-#MC FileName KKPi MU 2012
-{"Mode":"Bd2DPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bd_D-pi+_Kpipi_CPV_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsrho_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstpi_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsstRho",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_Dsstrho_KKpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Lb_Lambdacpi_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/B2DX_MC_Bs_DsK_KKpi_CPV_Up_BDTG3_Bs.root",
- "TreeName":"DecayTree"}
-###
-
-
-#Kfactor MC FileName MD
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-#Kfactor MC FileName MU
-{"Mode":"Bs2DsstPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsstPi_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bs2DsK",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bs2DsK_Ds2KKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Lb2LcPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Lb2LcPi_Lc2pKPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-{"Mode":"Bd2DPi",
- "FileName":"/afs/cern.ch/work/a/adudziak/public/MCJanuary2014/MergedTree_Bd2DPi_D2KPiPi_BsHypo_BDTG.root",
- "TreeName":"DecayTree"}
-###
-
-
-#Signal Bs2DsPi KstK 2011 blabla
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_Dspi_KKpi_Dn_OFFLINE_Bs_Dspi_KstK.root
-B2DX_MC_Bs_Dspi_KKpi_Up_OFFLINE_Bs_Dspi_KstK.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi PhiPi 2011 blabla
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_Dspi_KKpi_Dn_OFFLINE_Bs_Dspi_phipi.root
-B2DX_MC_Bs_Dspi_KKpi_Up_OFFLINE_Bs_Dspi_phipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi NonRes 2011 blabla
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_Dspi_KKpi_Dn_OFFLINE_Bs_Dspi_nonres.root
-B2DX_MC_Bs_Dspi_KKpi_Up_OFFLINE_Bs_Dspi_nonres.root
-DecayTree
-DecayTree
-###
-
-
-#Signal Bs2DsPi KPiPi 2011 blabla
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_Dspi_Kpipi_Dn_OFFLINE_Bs_Dspi_Kpipi.root
-B2DX_MC_Bs_Dspi_Kpipi_Up_OFFLINE_Bs_Dspi_Kpipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi PiPiPi 2011 hhhhhhhhhhhhhhh
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL/
-B2DX_MC_Bs_Dspi_pipipi_Up_BDTG_Bs.root
-B2DX_MC_Bs_Dspi_pipipi_Dn_BDTG_Bs.root
-DecayTree
-DecayTree
-###
-
-
-#Signal Bs2DsPi PiPiPi 2011 blabla
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_Dspi_pipipi_Dn_OFFLINE_Bs_Dspi_pipipi.root
-B2DX_MC_Bs_Dspi_pipipi_Up_OFFLINE_Bs_Dspi_pipipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi KstK 2012 blabla
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_Dspi_KKpi_Dn_OFFLINE_Bs_Dspi_KstK.root
-B2DX_MC_Bs_Dspi_KKpi_Up_OFFLINE_Bs_Dspi_KstK.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi PhiPi 2012 blabla
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_Dspi_KKpi_Dn_OFFLINE_Bs_Dspi_phipi.root
-B2DX_MC_Bs_Dspi_KKpi_Up_OFFLINE_Bs_Dspi_phipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi NonRes 2012 blabla
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_Dspi_KKpi_Dn_OFFLINE_Bs_Dspi_nonres.root
-B2DX_MC_Bs_Dspi_KKpi_Up_OFFLINE_Bs_Dspi_nonres.root
-DecayTree
-DecayTree
-###
-
-
-#Signal Bs2DsPi KPiPi 2012 blabla
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_Dspi_Kpipi_Dn_OFFLINE_Bs_Dspi_Kpipi.root
-B2DX_MC_Bs_Dspi_Kpipi_Up_OFFLINE_Bs_Dspi_Kpipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi PiPiPi 2012 blabla
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3/
-B2DX_MC_Bs_Dspi_pipipi_Dn_OFFLINE_Bs_Dspi_pipipi.root
-B2DX_MC_Bs_Dspi_pipipi_Up_OFFLINE_Bs_Dspi_pipipi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi KKPi 2012 blabla
-root://eoslhcb.cern.ch//eos/lhcb/user/m/mvitti/ETA_ntuples/
-MC_Bs_DsPi_BDTG3_Up_kkpi.root
-MC_Bs_DsPi_BDTG3_Dn_kkpi.root
-DecayTree
-DecayTree
-###
-
-#Signal Bs2DsPi KKPi 2012
-root://eoslhcb.cern.ch//eos/lhcb/wg/b2oc/TD_DsK_3fb/TD_DsK3fb_MC/FINAL_WITH_BDTG3
-B2DX_MC_Bs_Dspi_KKpi_Dn_BDTG3_Bs.root
-B2DX_MC_Bs_Dspi_KKpi_Up_BDTG3_Bs.root
-DecayTree
-DecayTree
-###
-
-#PID2m2
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_0123.root
-EffHistos_Reco12_39Mom_MagUp_2m2_012.root
-###
-
-#PID2m22
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_2m2_45678.root
-EffHistos_Reco12_39Mom_MagUp_2m2_3456.root
-###
-
-#PIDp3
-/afs/cern.ch/work/a/adudziak/public/hist/
-EffHistos_Reco12_39Mom_MagDown_Proton_DLLKDLLpK.root
-EffHistos_Reco12_39Mom_MagUp_Proton_DLLKDLLpK.root
-###
-
-
-
-
diff --git a/PhysFit/B2DXFitters/data/settings/set.py b/PhysFit/B2DXFitters/data/settings/set.py
deleted file mode 100644
index 09cc9a0eb1621776d4b2f8d1864114170cc14542..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/settings/set.py
+++ /dev/null
@@ -1,8 +0,0 @@
-def getconfig() :
-
-    configdict = {}
-
-    configdict["BasicVariables"] = {}
-    configdict["BasicVariables"]["BeautyMass"]    = { "Range" : [0.0,1.0], "InputName" : "fake"}
-
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/toyFactoryConfig.py b/PhysFit/B2DXFitters/data/toyFactoryConfig.py
deleted file mode 100644
index bc563ebbe48a94c9e81a69829451c518946e211f..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/toyFactoryConfig.py
+++ /dev/null
@@ -1,301 +0,0 @@
-from __future__ import division
-from past.utils import old_div
-def getconfig() :
-
-    configdict = {}
-
-    ############################################################
-    #List of observables for all the PDFs.
-    #The content of this dictionary determines the observables
-    #to generate for and how may taggers are present.
-    ############################################################
-    
-    configdict["Observables"] = {}
-    configdict["Observables"] = {"BeautyMass":    {"Type"  : "RooRealVar",
-                                                   "Title" : "B mass (MeV/c^2)",
-                                                   "Range" : [5090, 6000]},
-                                 #"CharmMass":     {"Type" : "RooRealVar",
-                                 #                  "Title" : "D mass (MeV/c^2)",
-                                 #                  "Range" : [1835, 1903]},
-                                 "BeautyTime":    {"Type" : "RooRealVar",
-                                                   "Title" : "B decay time (ps)",
-                                                   "Range" : [0.2, 15.0]},
-                                 "BeautyTimeErr": {"Type" : "RooRealVar",
-                                                   "Title" : "B decay time error (ps)",
-                                                   "Range" : [0.01, 0.1]},
-                                 "BacCharge":     {"Type"  : "RooCategory",
-                                                   "Title" : "Bachelor charge",
-                                                   "Categories": { "h+" : +1,
-                                                                   "h-" : -1}},
-                                 "MistagOS":      {"Type" : "RooRealVar",
-                                                   "Title" : "#eta_{OS}",
-                                                   "Range" : [0.0,0.5]},
-                                 "MistagSS":      {"Type" : "RooRealVar",
-                                                   "Title" : "#eta_{SS}",
-                                                   "Range" : [0.0,0.5]},
-                                 "TrueID":        {"Type" : "RooRealVar",
-                                                   "Title" : "True component ID",
-                                                   "Range" : [0.0,1000.0]},
-                                 "TagDecOS":      {"Type"  : "RooCategory",
-                                                   "Title" : "q_{t}^{OS}",
-                                                   "Categories": { "B+"       : +1,
-                                                                   "Untagged" : 0,
-                                                                   "B-"       : -1}},
-                                 "TagDecSS":      {"Type"  : "RooCategory",
-                                                   "Title" : "q_{t}^{SS}",
-                                                   "Categories": { "B+"       : +1,
-                                                                   "Untagged" : 0,
-                                                                   "B-"       : -1}}
-                                 }
-
-    ############################################################ 
-    #List of mass hypotheses for bachelor
-    #The content of this dictionary determines how many
-    #bachelor PID bins the final dataset is splitted into
-    ############################################################
-    
-    configdict["Hypothesys"] = ["Bd2DPi", "Bd2DK"]
-
-    ############################################################
-    #Signal decay, Charm decay mode and year of data taking
-    #Splitting per magnet polarity not implemented, at the moment
-    ############################################################
-
-    configdict["Decay"] = "Bd2DPi"
-    configdict["CharmModes"] = ["KPiPi"]
-    configdict["Years"] = ["run1"]
-
-    ############################################################ 
-    #List of components with yields to generate.
-    #The content of this dictionary determines, for each
-    #PID bin and year, how many PDF components are generated.
-    #If there is only signal, a TTree ready for sFit is
-    #generated directly, without need for doing a (useless)
-    #mass fit.
-    ############################################################
-    
-    configdict["Components"] = {}
-    configdict["Components"] = {"Signal"        : {"Bd2DPi": {"run1": {"KPiPi": [15000] } }, "Bd2DK": {"run1": {"KPiPi": [5000] } } }} #
-#                                "Combinatorial" : {"Bd2DPi": {"run1": {"KPiPi": [8000] } }, "Bd2DK": {"run1": {"KPiPi": [2000] } } },
- #                               "Bd2DRho"       : {"Bd2DPi": {"run1": {"KPiPi": [8000] } }, "Bd2DK": {"run1": {"KPiPi": [2000] } } } }
-                                
-
-    ############################################################
-    #"Code" to identify the True ID for each component
-    ############################################################
-
-    configdict["TrueID"] = {}
-    configdict["TrueID"] = {"Signal"        : 100,
-                            "Combinatorial" : 200,
-                            "Bd2DRho"       : 300}
-
-    ############################################################
-    #List of PDFs for "time-independent" observables
-    #Dictionary structure: observable->component->bachelor hypo->year->D mode
-    ############################################################
-
-    configdict["PDFList"] = {}
-    configdict["PDFList"]["BeautyMass"] = {}
-    configdict["PDFList"]["BeautyMass"]["Signal"] = {"Bd2DPi":
-                                                     {"run1":
-                                                      {"KPiPi":
-                                                       {"Type"       : "Ipatia",
-                                                        "mean"       : [5.28017e+03],
-                                                        "sigma"      : [2.02063e+01],
-                                                        "zeta"       : [0.0],
-                                                        "fb"         : [0.0],
-                                                        "l"          : [-3.20961e+00],
-                                                        "a1"         : [1.42911e+00], #left
-                                                        "a2"         : [1.86674e+00], #right
-                                                        "n1"         : [2.74488e+00], #left
-                                                        "n2"         : [3.18373e+00]} #right
-                                                       }
-                                                      },
-                                                     "Bd2DK":
-                                                     {"run1":
-                                                      {"KPiPi":
-                                                       {"Type"       : "Ipatia",
-                                                        "mean"       : [5.32715e+03],
-                                                        "sigma"      : [2.33716e+01],
-                                                        "zeta"       : [0.0],
-                                                        "fb"         : [0.0],
-                                                        "l"          : [-9.07419e+00],
-                                                        "a1"         : [2.70454e+00],
-                                                        "a2"         : [7.03565e-01],
-                                                        "n1"         : [3.66284e-01],
-                                                        "n2"         : [2.08885e+00]}
-                                                       }
-                                                      }
-                                                     }
-    configdict["PDFList"]["BeautyMass"]["Combinatorial"] = {"Bd2DPi":
-                                                            {"run1":
-                                                             {"KPiPi":
-                                                              {"Type":    "Exponential",
-                                                               "cB"  :    [-2.27055e-03]}
-                                                              }
-                                                             },
-                                                            "Bd2DK":
-                                                            {"run1":
-                                                             {"KPiPi":
-                                                              {"Type":    "Exponential",
-                                                               "cB"  :    [-5.08454e-03]}
-                                                              }
-                                                             }
-                                                            }
-    configdict["PDFList"]["BeautyMass"]["Bd2DRho"] = {"Bd2DPi":
-                                                      {"run1":
-                                                       {"KPiPi":
-                                                        {"Type"      : "JohnsonSU",
-                                                         "mean"      : [4.65054e+03],
-                                                         "sigma"     : [1.09666e+03],
-                                                         "nu"        : [-2.04803e+00],
-                                                         "tau"       : [1.32664e+00]}
-                                                        }
-                                                       },
-                                                      "Bd2DK":
-                                                      {"run1":
-                                                       {"KPiPi":
-                                                        {"Type": "FromWorkspace",
-                                                         "File": "/afs/cern.ch/work/a/adudziak/public/workspace/DsK3fbPAPER/nominal_1stdraft/work_dspi_hlt_mcpid_signalpid_combok.root",
-                                                         "Workspace" : "workspace",
-                                                         "Name"      : "PhysBkgBs2DsRhoPdf_m_both_2012"
-                                                         }
-                                                        }
-                                                       }
-                                                      }
-
-    ############################################################ 
-    #Tagging calibration and mistag PDF. If "MistagPDF" : None,
-    #then a average mistag is used
-    ############################################################
-    
-    configdict["Taggers"] = {}
-    for comp in configdict["Components"].keys():
-        configdict["Taggers"][comp] = {}
-        configdict["Taggers"][comp] = {"OS" :
-                                       {"Calibration":
-                                        {"p0"       : [0.0],
-                                         "p1"       : [1.0],
-                                         "deltap0"  : [0.0],
-                                         "deltap1"  : [0.0],
-                                         "avgeta"   : [0.35],
-                                         "tageff"   : [0.6],
-                                         "tagasymm" : [0.0]
-                                         },
-                                        "MistagPDF" :
-                                        {"Type"     : "Mock",
-                                         "eta0"     : [0.0],
-                                         "etaavg"   : [0.35],
-                                         "f"        : [0.25]
-                                         }
-                                        },
-                                       "SS":
-                                       {"Calibration":
-                                        {"p0"       : [0.0],
-                                         "p1"       : [1.0],
-                                         "deltap0"  : [0.0],
-                                         "deltap1"  : [0.0],
-                                         "avgeta"   : [0.35],
-                                         "tageff"   : [0.6],
-                                         "tagasymm" : [0.0]
-                                         },
-                                        "MistagPDF" :
-                                        {"Type"     : "Mock",
-                                         "eta0"     : [0.0],
-                                         "etaavg"   : [0.35],
-                                         "f"        : [0.25]
-                                         }
-                                        }
-                                       }
-
-    ############################################################ 
-    #Time resolution and acceptance (there is a single dict because
-    #they are strongly connected in the way they are built).
-    #If "TimeErrorPDF" : None, then an average resolution model
-    #is used.
-    ############################################################
-    
-    configdict["ResolutionAcceptance"] = {}
-    for comp in configdict["Components"].keys():
-        configdict["ResolutionAcceptance"][comp] = {}
-        configdict["ResolutionAcceptance"][comp] = {"TimeErrorPDF": #None,
-                                                    {"Type": "Mock",
-                                                     "ResolutionAverage" : [0.5]
-                                                     },
-                                                    "Acceptance":
-                                                    {"Type": "Spline",
-                                                     "KnotPositions" : [ 0.5, 1.0, 1.5, 2.0, 3.0, 12.0 ],
-                                                     "KnotCoefficients" : [ 4.5853e-01, 6.8963e-01, 8.8528e-01,
-                                                                            1.1296e+00, 1.2232e+00, 1.2277e+00 ]},
-                                                    #"Resolution":
-                                                    #{"Type": "AverageModel",
-                                                    # "Parameters": { 'sigmas': [ 0.050 ], 'fractions': [] },
-                                                    # "Bias": [0.0],
-                                                    # "ScaleFactor": [1.0]}
-                                                    "Resolution":
-                                                    {"Type": "GaussianWithPEDTE",
-                                                     "Average": [0.5],
-                                                     "Bias": [0.0],
-                                                     "ScaleFactor": [1.0]}
-                                                    }
-        
-    ############################################################ 
-    #Production and detection asymmetries
-    ############################################################
-    
-    configdict["ProductionAsymmetry"] = {}
-    configdict["DetectionAsymmetry"] = {}
-    for comp in configdict["Components"].keys():
-        configdict["ProductionAsymmetry"][comp] = {}
-        configdict["DetectionAsymmetry"][comp] = {}
-        configdict["ProductionAsymmetry"][comp] = [0.1]
-        configdict["DetectionAsymmetry"][comp] = [0.1]
-
-    ############################################################ 
-    #Time PDF parameters
-    ############################################################
-    
-    configdict["ACP"] = {}
-
-    #Parameters from https://svnweb.cern.ch/trac/lhcb/browser/DBASE/tags/Gen/DecFiles/v27r42/dkfiles/Bd_D-pi+,Kpipi=CPVDDalitz,DecProdCut.dec)
-    ModqOverp_d     =  1
-    ArgqOverp_d     =  -0.746
-    ModpOverq_d     =  1
-    ArgpOverq_d     =  0.746
-    ModAf_d         =  0.0849
-    ArgAf_d         =  0.002278
-    ModAbarf_d      =  0.00137
-    ArgAbarf_d      =  -1.128958
-    ModAfbar_d      =  0.00137
-    ArgAfbar_d      =  1.3145
-    ModAbarfbar_d   =  0.0849
-    ArgAbarfbar_d   =  0.002278
-
-    #Signal (use more convenient interface with ArgLf_d, ArgLbarfbar_d and ModLf_d)
-    configdict["ACP"]["Signal"] = { "Gamma"                : [0.656],
-                                    "DeltaGamma"           : [0.00267],
-                                    "DeltaM"               : [0.510],
-                                    "ArgLf"                : [ArgqOverp_d + ArgAbarf_d - ArgAf_d],
-                                    "ArgLbarfbar"          : [ArgpOverq_d + ArgAfbar_d - ArgAbarfbar_d],
-                                    "ModLf"                : [old_div(ModAbarf_d,ModAf_d)],
-                                    "ParameteriseIntegral" : True,
-                                    "NBinsAcceptance"      : 0, #keep at zero if using spline acceptance!
-                                    "NBinsProperTimeErr"   : 100}
-
-    for comp in configdict["Components"].keys():
-        if comp != "Signal":
-            #Use other interface with C, S, Sbar, D, Dbar
-            #We build trivial PDFs since we don't care about background shapes in time if we use sWeights
-            configdict["ACP"][comp] = { "Gamma"                 : [1.0],
-                                        "DeltaGamma"            : [0.0],
-                                        "DeltaM"                : [0.0],
-                                        "C"                     : [0.0],
-                                        "S"                     : [0.0],
-                                        "Sbar"                  : [0.0],
-                                        "D"                     : [0.0],
-                                        "Dbar"                  : [0.0],
-                                        "ParameteriseIntegral"  : True,
-                                        "NBinsAcceptance"       : 0, #keep at zero if using spline acceptance!
-                                        "NBinsProperTimeErr"    : 100}
-    
-    return configdict
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/WS_Mass_DsK_5M_BDTGA.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/WS_Mass_DsK_5M_BDTGA.root
deleted file mode 100644
index 8c37cb2a9b5c8c8677e378202c53efc0ae86f5aa..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/WS_Mass_DsK_5M_BDTGA.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/WS_Mass_DsPi_5M_BDTGA.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/WS_Mass_DsPi_5M_BDTGA.root
deleted file mode 100644
index 68a6358b86c9f642663fb2182250c705b193b063..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/WS_Mass_DsPi_5M_BDTGA.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/histograms_MC_KFactor_BsDsK.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/histograms_MC_KFactor_BsDsK.root
deleted file mode 100644
index 0f6b536390017755925f2c85611bb33f3b23fa2d..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/histograms_MC_KFactor_BsDsK.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/makehistsfromhistpdfs.py b/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/makehistsfromhistpdfs.py
deleted file mode 100644
index 4c9947dcf473d28bcbb50f7ab91f4d2b4a2f798a..0000000000000000000000000000000000000000
--- a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/makehistsfromhistpdfs.py
+++ /dev/null
@@ -1,54 +0,0 @@
-import os,sys
-import ROOT
-from ROOT import *
-import copy
-
-names = ["kFactor_Bd2DK_both",
-"kFactor_Bd2DPi_both",
-"kFactor_Bs2DsPi_both",
-"kFactor_Bs2DsRho_both",
-"kFactor_Bs2DsstPi_both",
-"kFactor_Lb2Dsp_both",
-"kFactor_Lb2Dsstp_both",
-"kFactor_Lb2LcK_both",
-"kFactor_Lb2LcPi_both"]
-
-varname = "kfactorVar"
-
-filestoedit = [
-"template_MC_KFactor_BsDsK_5300_5350.root",
-"template_MC_KFactor_BsDsK_5350_5400.root",
-"template_MC_KFactor_BsDsK_5400_5450.root",
-"template_MC_KFactor_BsDsK_5450_5500.root",
-"template_MC_KFactor_BsDsK_5500_5550.root",
-"template_MC_KFactor_BsDsK_5550_5600.root",
-"template_MC_KFactor_BsDsK_5600_5650.root",
-"template_MC_KFactor_BsDsK_5650_5700.root",
-"template_MC_KFactor_BsDsK_5700_5750.root",
-"template_MC_KFactor_BsDsK_5750_5800.root"
-]
-
-histstowrite = {}
-for name in names :
-    histstowrite[name] = []
-
-for filename in filestoedit :
-    range_low  = (filename.split('_BsDsK_')[1].split('_')[0])
-    range_high = (filename.split('_BsDsK_')[1].split('_')[1].split('.')[0])
-    inputfile = TFile(filename)
-    myw = inputfile.Get("workspace")
-    for name in names :
-        hist = myw.pdf(name).dataHist().createHistogram(varname)
-        #print name,range_low,range_high,hist.GetEffectiveEntries()
-        if hist.GetEntries() < 2 or hist.GetEffectiveEntries() < 3 :
-            hist = histstowrite[name][-1].Clone()
-        if hist.GetEffectiveEntries() < 10 :
-            hist.Rebin()
-            hist.Rebin()
-        hist.SetName(name.replace('_both','')+"_"+range_low+"_"+range_high)
-        histstowrite[name].append(copy.deepcopy(hist))
-outputfile = TFile("histograms_MC_KFactor_BsDsK.root","recreate")
-for histgroup in histstowrite :
-    for hist in histstowrite[histgroup] :
-        hist.Write()
-outputfile.Close()
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5300_5350.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5300_5350.root
deleted file mode 100644
index 3b4d012c92c313f81f0f8215f695c834adac5d12..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5300_5350.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5350_5400.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5350_5400.root
deleted file mode 100644
index 7b20516c897a31586a3b6163e0426d248a71c5ae..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5350_5400.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5400_5450.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5400_5450.root
deleted file mode 100644
index b9522453704a628be7843d87f2a350fc1bda18f0..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5400_5450.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5450_5500.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5450_5500.root
deleted file mode 100644
index 0b77487fe4fdc41f6f1fc5044059f529188ab90d..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5450_5500.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5500_5550.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5500_5550.root
deleted file mode 100644
index a4819aeca93b4ba91734b463e048a872dd5d3896..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5500_5550.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5550_5600.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5550_5600.root
deleted file mode 100644
index c8993d83215fa1a42c2935ac2d53f9cf8f78b9e1..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5550_5600.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5600_5650.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5600_5650.root
deleted file mode 100644
index 6f81999cb70c3c89e9b904961cd58f162c0597b9..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5600_5650.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5650_5700.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5650_5700.root
deleted file mode 100644
index 27ad587962c081db77d82e7790b6426848a042c0..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5650_5700.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5700_5750.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5700_5750.root
deleted file mode 100644
index c7ef3169ecfa5d3a97acabec7a9fe46290e8458f..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5700_5750.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5750_5800.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5750_5800.root
deleted file mode 100644
index 4c3434c94f9bd3f6a6fb953234355e3cd754aeef..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/kFactorsInMassBins/template_MC_KFactor_BsDsK_5750_5800.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Mistag_BDPi.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Mistag_BDPi.root
deleted file mode 100644
index b776cd99a8fbd01be598ef8f9df901b8d8be3748..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Mistag_BDPi.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Mistag_BsDsK.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Mistag_BsDsK.root
deleted file mode 100644
index 799fbd1cf5f780f52e5e992188a4c72d408c0b20..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Mistag_BsDsK.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root
deleted file mode 100644
index 90ee491899eb199387d1f53185952af379b61e78..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Mistag_BsDsPi.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root
deleted file mode 100644
index 050ef83e5038993a92d9b9b46016996a3bb8dddc..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Mistag_CombBkg.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Mistag_CombBkg_DsK.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Mistag_CombBkg_DsK.root
deleted file mode 100644
index 9f4054e5ba4ccd5d22bb73f5779ee9cf002322db..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Mistag_CombBkg_DsK.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTG06.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTG06.root
deleted file mode 100644
index 1f4238153f12aa7ac4fbaf3cd2c988ffe868337f..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTG06.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTG1.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTG1.root
deleted file mode 100644
index 4e1deff05fb2d09b8a7f18a53e6ebc72eb1a5c8c..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTG1.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTG3.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTG3.root
deleted file mode 100644
index df29303da4a6dadef727636b384fcc0a2d4ab35f..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTG3.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root
deleted file mode 100644
index 8d97b4c9daa29e71aca436f7ab69a689fec8da34..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsK_BDTGA.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTG06.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTG06.root
deleted file mode 100644
index c2c25476f174eb4672908642db73a32623fe5435..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTG06.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTG1.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTG1.root
deleted file mode 100644
index 1bc0a822042a8dd0adb92aae5680d21fe2554222..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTG1.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTG3.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTG3.root
deleted file mode 100644
index 920fa8d9471b81c14b493ca650650fb43bc49e93..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTG3.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root
deleted file mode 100644
index 7c1e6e6807a89edc94cedc79d7f740ea5b69dba0..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_Bs2DsPi_BDTGA.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_BsDsK.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_BsDsK.root
deleted file mode 100644
index 9564d3acdf342c0c018fbaa13360c95faf5133ae..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_BsDsK.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_BsDsPi.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_BsDsPi.root
deleted file mode 100644
index 002b2ce36a0e4e21996a679ebe40f4eb084cf6fd..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_Data_Terr_BsDsPi.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5300_5800.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5300_5800.root
deleted file mode 100644
index 3e4f5f3a929ee167d0af6ffe28796a1719123b17..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5300_5800.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root
deleted file mode 100644
index 57ff79462e7bdda3769ffb7cba92fdbe221c7695..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_MC_KFactor_BsDsK_5320_5420.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_MC_KFactor_BsDsPi_5320_5420.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/template_MC_KFactor_BsDsPi_5320_5420.root
deleted file mode 100644
index d83fd13415411c77868e9fff92f01e86153beb18..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/template_MC_KFactor_BsDsPi_5320_5420.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/templates_BsDsK.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/templates_BsDsK.root
deleted file mode 100644
index 2496f7309877183a901c947704277fd2441984e9..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/templates_BsDsK.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/MDFitter/templates_BsDsPi.root b/PhysFit/B2DXFitters/data/workspace/MDFitter/templates_BsDsPi.root
deleted file mode 100644
index 887668c4767246c23eb41ede7e91c31f4973ee9f..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/MDFitter/templates_BsDsPi.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/WS_Mass_DsK.root b/PhysFit/B2DXFitters/data/workspace/WS_Mass_DsK.root
deleted file mode 100644
index 0356a0bf205ff9cf8acf06cfc537056dca31a040..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/WS_Mass_DsK.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/WS_Mass_DsPi.root b/PhysFit/B2DXFitters/data/workspace/WS_Mass_DsPi.root
deleted file mode 100644
index 4c051f8359f1602a1ae65832bc2eabe7db76bb9d..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/WS_Mass_DsPi.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/kfactor_wspace.root b/PhysFit/B2DXFitters/data/workspace/kfactor_wspace.root
deleted file mode 100644
index 5a663080bf8418eaeeacca1a1225ac11a24616b6..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/kfactor_wspace.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/work_dsk.root b/PhysFit/B2DXFitters/data/workspace/work_dsk.root
deleted file mode 100644
index 4e958cff6857b7616f527113ca160d6e2b632fa0..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/work_dsk.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/work_dspi.root b/PhysFit/B2DXFitters/data/workspace/work_dspi.root
deleted file mode 100644
index f8762f6c10437fe7fceb5267daa0b213f5277aef..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/work_dspi.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/work_toys_dsk.root b/PhysFit/B2DXFitters/data/workspace/work_toys_dsk.root
deleted file mode 100644
index 14b55456cfb5b7eaf63e54821f8a072094774634..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/work_toys_dsk.root and /dev/null differ
diff --git a/PhysFit/B2DXFitters/data/workspace/work_toys_dspi.root b/PhysFit/B2DXFitters/data/workspace/work_toys_dspi.root
deleted file mode 100644
index cc91cc7645b995fff88249c2854650f64aef309a..0000000000000000000000000000000000000000
Binary files a/PhysFit/B2DXFitters/data/workspace/work_toys_dspi.root and /dev/null differ