From c979243980b8edde6e4299124212c074f31c7dc4 Mon Sep 17 00:00:00 2001 From: Agnieszka Dziurda <adudziak@lxplus741.cern.ch> Date: Wed, 10 Jul 2019 16:35:32 +0200 Subject: [PATCH 1/2] added PhysFit/B2DXFitters from Urania (Urania/master) --- .../Bs2DsPiConfigForSignalNoVetoNoPID.py | 71 +++++++++++++++++++ .../Bs2DsPi/Bs2DsPiConfigForSignalVetoPID.py | 67 +++++++++++++++++ 2 files changed, 138 insertions(+) create mode 100644 PhysFit/B2DXFitters/data/Bs2DsK_Run2CPV/Bs2DsPi/Bs2DsPiConfigForSignalNoVetoNoPID.py create mode 100644 PhysFit/B2DXFitters/data/Bs2DsK_Run2CPV/Bs2DsPi/Bs2DsPiConfigForSignalVetoPID.py diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_Run2CPV/Bs2DsPi/Bs2DsPiConfigForSignalNoVetoNoPID.py b/PhysFit/B2DXFitters/data/Bs2DsK_Run2CPV/Bs2DsPi/Bs2DsPiConfigForSignalNoVetoNoPID.py new file mode 100644 index 000000000..06bde4aea --- /dev/null +++ b/PhysFit/B2DXFitters/data/Bs2DsK_Run2CPV/Bs2DsPi/Bs2DsPiConfigForSignalNoVetoNoPID.py @@ -0,0 +1,71 @@ + +def getconfig() : + + from Bs2DsPiConfigForNominalMassFit import getconfig as getconfig_nominal + configdict = getconfig_nominal() + + #configdict["YearOfDataTaking"] = {"2015","2016","2017","2018"} + #configdict["CharmModes"] = {"KstK","NonRes","PhiPi","KPiPi","PiPiPi"} + + # 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"} + 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.475, 1.0 ], "InputName" : "BDTGResponse_XGB_1"} + + configdict["dataName"] = "../data/Bs2DsK_Run2CPV/Bs2DsPi/config_Bs2DsPi_SignalNoVetoNoPID.txt" + + configdict["AdditionalVariables"] = {} + + #the values ARE NOT CORRECT + #configdict["GlobalWeight"] = {"2015": {"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}}, + # "2016": {"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}}, + # "2017": {"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}}, + # "2018": {"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}}} + + + #weighting templates by PID eff/misID + configdict["WeightingMassTemplates"] = { "PIDBachEff": { "2015":{"FileLabel":"#PIDK Pion 2015", "Var":["nTracks","lab1_P"], "HistName":"Pi_DLLK < 0 && IsMuon ==0.0_All;"}, + "2016":{"FileLabel":"#PIDK Pion 2016", "Var":["nTracks","lab1_P"], "HistName":"Pi_DLLK < 0 && IsMuon ==0.0_All;"}, + "2017":{"FileLabel":"#PIDK Pion 2017", "Var":["nTracks","lab1_P"], "HistName":"Pi_DLLK < 0 && IsMuon ==0.0_All;"}, + "2018":{"FileLabel":"#PIDK Pion 2018", "Var":["nTracks","lab1_P"], "HistName":"Pi_DLLK < 0 && IsMuon ==0.0_All;"}, + }, + "RatioDataMC": { "2015":{"FileLabel":"#DataMC 2015", "Var":["lab1_P","nTracks"], "HistName":"histRatio"}, + "2016":{"FileLabel":"#DataMC 2016", "Var":["lab1_P","nTracks"], "HistName":"histRatio"}, + "2017":{"FileLabel":"#DataMC 2017", "Var":["lab1_P","nTracks"], "HistName":"histRatio"}, + "2018":{"FileLabel":"#DataMC 2018", "Var":["lab1_P","nTracks"], "HistName":"histRatio"}, + }, + "Shift": { "2011":{"BeautyMass": 0.0, "CharmMass": 0.0}, + "2012":{"BeautyMass": 0.0, "CharmMass": 0.0}, + "2015":{"BeautyMass": -1.0, "CharmMass": 0.0}, + "2016":{"BeautyMass": -1.1, "CharmMass": 0.0}, + "2017":{"BeautyMass": -0.95, "CharmMass": 0.0}, + "2018":{"BeautyMass": -1.65, "CharmMass": 0.0}, + } + } + + + return configdict diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_Run2CPV/Bs2DsPi/Bs2DsPiConfigForSignalVetoPID.py b/PhysFit/B2DXFitters/data/Bs2DsK_Run2CPV/Bs2DsPi/Bs2DsPiConfigForSignalVetoPID.py new file mode 100644 index 000000000..f10ee1292 --- /dev/null +++ b/PhysFit/B2DXFitters/data/Bs2DsK_Run2CPV/Bs2DsPi/Bs2DsPiConfigForSignalVetoPID.py @@ -0,0 +1,67 @@ + +def getconfig() : + + from Bs2DsPiConfigForNominalMassFit import getconfig as getconfig_nominal + configdict = getconfig_nominal() + + configdict["YearOfDataTaking"] = {"2015","2016","2017","2018"} + configdict["CharmModes"] = {"KstK","NonRes","PhiPi","KPiPi","PiPiPi"} + + # 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"} + 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.475, 1.0 ], "InputName" : "BDTGResponse_XGB_1"} + + configdict["dataName"] = "../data/Bs2DsK_Run2CPV/Bs2DsPi/config_Bs2DsPi_SignalNoVetoNoPID.txt" + + configdict["AdditionalVariables"] = {} + + #the values ARE NOT CORRECT + configdict["GlobalWeight"] = {"2015": {"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}}, + "2016": {"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}}, + "2017": {"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}}, + "2018": {"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}}} + + + #weighting templates by PID eff/misID + configdict["WeightingMassTemplates"] = { + "RatioDataMC": { "2015":{"FileLabel":"#DataMC 2015", "Var":["lab1_P","nTracks"], "HistName":"histRatio"}, + "2016":{"FileLabel":"#DataMC 2016", "Var":["lab1_P","nTracks"], "HistName":"histRatio"}, + "2017":{"FileLabel":"#DataMC 2017", "Var":["lab1_P","nTracks"], "HistName":"histRatio"}, + "2018":{"FileLabel":"#DataMC 2018", "Var":["lab1_P","nTracks"], "HistName":"histRatio"}, + }, + "Shift": { "2011":{"BeautyMass": 0.0, "CharmMass": 0.0}, + "2012":{"BeautyMass": 0.0, "CharmMass": 0.0}, + "2015":{"BeautyMass": -1.0, "CharmMass": 0.0}, + "2016":{"BeautyMass": -1.1, "CharmMass": 0.0}, + "2017":{"BeautyMass": -0.95, "CharmMass": 0.0}, + "2018":{"BeautyMass": -1.65, "CharmMass": 0.0}, + } + } + + + return configdict -- GitLab From 3531f7598c4ec34c625c4847ad473a20dc83fc18 Mon Sep 17 00:00:00 2001 From: Agnieszka Dziurda <adudziak@lxplus768.cern.ch> Date: Thu, 11 Jul 2019 12:37:25 +0200 Subject: [PATCH 2/2] update for Bs2DsPi DGs --- .../Bs2DsPiConfigForDataWorkspaceDGs.py | 51 +++++++++++++++++++ .../Bs2DsPiConfigForNominalMassFitDGs.py | 51 +++++++++++++++++++ .../B2DXFitters/MDFitSettingTranslator.py | 2 +- 3 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 PhysFit/B2DXFitters/data/Bs2DsK_Run2CPV/Bs2DsPi/Bs2DsPiConfigForDataWorkspaceDGs.py create mode 100644 PhysFit/B2DXFitters/data/Bs2DsK_Run2CPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitDGs.py diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_Run2CPV/Bs2DsPi/Bs2DsPiConfigForDataWorkspaceDGs.py b/PhysFit/B2DXFitters/data/Bs2DsK_Run2CPV/Bs2DsPi/Bs2DsPiConfigForDataWorkspaceDGs.py new file mode 100644 index 000000000..399b979f7 --- /dev/null +++ b/PhysFit/B2DXFitters/data/Bs2DsK_Run2CPV/Bs2DsPi/Bs2DsPiConfigForDataWorkspaceDGs.py @@ -0,0 +1,51 @@ +def getconfig() : + + from Bs2DsPiConfigForNominalMassFit import getconfig as getconfig_nominal + configdict = getconfig_nominal() + + configdict["YearOfDataTaking"] = {"2015", "2016"} + + configdict["BasicVariables"] = {} + configdict["BasicVariables"]["BeautyMass"] = { "Range" : [5300, 5800 ], "InputName" : "lab0_MassFitConsD_M"} + configdict["BasicVariables"]["CharmMass"] = { "Range" : [1930, 2015 ], "InputName" : "lab2_MM"} + configdict["BasicVariables"]["BacPT"] = { "Range" : [400.0, 45000.0 ], "InputName" : "lab1_PT"} + configdict["BasicVariables"]["BacP"] = { "Range" : [3000.0, 650000.0], "InputName" : "lab1_P"} + configdict["BasicVariables"]["BacPIDK"] = { "Range" : [-7.0, 5.0 ], "InputName" : "lab1_PIDK"} + configdict["BasicVariables"]["nTracks"] = { "Range" : [15.0, 1000.0 ], "InputName" : "nTracks"} + configdict["BasicVariables"]["BeautyTime"] = { "Range" : [0.4, 15.0 ], "InputName" : "lab0_LifetimeFitConsD_ctau"} + configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01, 0.1 ], "InputName" : "lab0_LifetimeFitConsD_ctauErr"} + configdict["BasicVariables"]["BDTG"] = { "Range" : [-1.0, 1.0 ], "InputName" : "BDTGResponse_XGB_1"} + + configdict["AdditionalVariables"] = {} + configdict["AdditionalVariables"]["lab0_P"] = { "Range" : [ 0.0, 1600000.0 ], "InputName" : "lab0_P"} + configdict["AdditionalVariables"]["lab0_PT"] = { "Range" : [ 0.0, 40000.0 ], "InputName" : "lab0_PT"} + configdict["AdditionalVariables"]["lab0_IPCHI2_OWNPV"] = { "Range" : [ 0.0, 10000.0 ], "InputName" : "lab0_IPCHI2_OWNPV"} + configdict["AdditionalVariables"]["lab1_IPCHI2_OWNPV"] = { "Range" : [ 0.0, 180000.0 ], "InputName" : "lab1_IPCHI2_OWNPV"} + configdict["AdditionalVariables"]["lab2_P"] = { "Range" : [ 0.0, 1800000.0 ], "InputName" : "lab2_P"} + configdict["AdditionalVariables"]["lab2_PT"] = { "Range" : [ 0.0, 90000.0 ], "InputName" : "lab2_PT"} + configdict["AdditionalVariables"]["lab2_IPCHI2_OWNPV"] = { "Range" : [ 0.0, 180000.0 ], "InputName" : "lab2_IPCHI2_OWNPV"} + configdict["AdditionalVariables"]["lab3_P"] = { "Range" : [ 0.0, 1800000.0 ], "InputName" : "lab3_P"} + configdict["AdditionalVariables"]["lab3_PT"] = { "Range" : [ 0.0, 90000.0 ], "InputName" : "lab3_PT"} + configdict["AdditionalVariables"]["lab3_IPCHI2_OWNPV"] = { "Range" : [ 0.0, 180000.0 ], "InputName" : "lab3_IPCHI2_OWNPV"} + configdict["AdditionalVariables"]["lab4_P"] = { "Range" : [ 0.0, 1800000.0 ], "InputName" : "lab4_P"} + configdict["AdditionalVariables"]["lab4_PT"] = { "Range" : [ 0.0, 90000.0 ], "InputName" : "lab4_PT"} + configdict["AdditionalVariables"]["lab4_IPCHI2_OWNPV"] = { "Range" : [ 0.0, 180000.0 ], "InputName" : "lab4_IPCHI2_OWNPV"} + configdict["AdditionalVariables"]["lab5_P"] = { "Range" : [ 0.0, 1800000.0 ], "InputName" : "lab5_P"} + configdict["AdditionalVariables"]["lab5_PT"] = { "Range" : [ 0.0, 90000.0 ], "InputName" : "lab5_PT"} + configdict["AdditionalVariables"]["lab5_IPCHI2_OWNPV"] = { "Range" : [ 0.0, 180000.0 ], "InputName" : "lab5_IPCHI2_OWNPV"} + configdict["AdditionalVariables"]["lab0_DIRA_OWNPV"] = { "Range" : [ 0.0, 1.1 ], "InputName" : "lab0_DIRA_OWNPV"} + configdict["AdditionalVariables"]["lab0_LifetimeFit_Dplus_ctau"] = { "Range" : [ -50000.0, 400000.0 ], "InputName" : "lab0_LifetimeFit_Dplus_ctau"} + configdict["AdditionalVariables"]["lab0_LifetimeFit_Dplus_ctauErr"] = { "Range" : [ 0.0, 10000.0 ], "InputName" : "lab0_LifetimeFit_Dplus_ctauErr"} + configdict["AdditionalVariables"]["lab0_LifetimeFit_Dplus_decayLength"] = { "Range" : [ -50000.0, 50000.0 ], "InputName" : "lab0_LifetimeFit_Dplus_decayLength"} + configdict["AdditionalVariables"]["lab0_LifetimeFit_Dplus_decayLengthErr"] = { "Range" : [ 0.0, 2000.0 ], "InputName" : "lab0_LifetimeFit_Dplus_decayLengthErr"} + configdict["AdditionalVariables"]["lab0_LifetimeFitConsD_chi2"] = { "Range" : [ 0.0, 60000000.0 ], "InputName" : "lab0_LifetimeFitConsD_chi2"} + configdict["AdditionalVariables"]["lab0_LifetimeFitConsD_nDOF"] = { "Range" : [ -50.0, 50.0 ], "InputName" : "lab0_LifetimeFitConsD_nDOF"} + configdict["AdditionalVariables"]["lab0_ENDVERTEX_CHI2"] = { "Range" : [ 0.0, 50.0 ], "InputName" : "lab0_ENDVERTEX_CHI2"} + configdict["AdditionalVariables"]["lab2_ENDVERTEX_CHI2"] = { "Range" : [ 0.0, 50.0 ], "InputName" : "lab2_ENDVERTEX_CHI2"} + configdict["AdditionalVariables"]["lab0_LifetimeFit_chi2"] = { "Range" : [ 0.0, 10000000.0 ], "InputName" : "lab0_LifetimeFit_chi2"} + configdict["AdditionalVariables"]["lab0_LifetimeFit_nDOF"] = { "Range" : [ -50.0, 50.0 ], "InputName" : "lab0_LifetimeFit_nDOF"} + + + + + return configdict diff --git a/PhysFit/B2DXFitters/data/Bs2DsK_Run2CPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitDGs.py b/PhysFit/B2DXFitters/data/Bs2DsK_Run2CPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitDGs.py new file mode 100644 index 000000000..8c7e9a53a --- /dev/null +++ b/PhysFit/B2DXFitters/data/Bs2DsK_Run2CPV/Bs2DsPi/Bs2DsPiConfigForNominalMassFitDGs.py @@ -0,0 +1,51 @@ +def getconfig() : + + from Bs2DsPiConfigForNominalMassFit import getconfig as getconfig_nominal + configdict = getconfig_nominal() + + configdict["YearOfDataTaking"] = {"2015", "2016"} + + configdict["BasicVariables"] = {} + configdict["BasicVariables"]["BeautyMass"] = { "Range" : [5300, 5800 ], "InputName" : "lab0_MassFitConsD_M"} + configdict["BasicVariables"]["CharmMass"] = { "Range" : [1930, 2015 ], "InputName" : "lab2_MM"} + configdict["BasicVariables"]["BacPT"] = { "Range" : [400.0, 45000.0 ], "InputName" : "lab1_PT"} + configdict["BasicVariables"]["BacP"] = { "Range" : [3000.0, 650000.0], "InputName" : "lab1_P"} + configdict["BasicVariables"]["BacPIDK"] = { "Range" : [-7.0, 5.0 ], "InputName" : "lab1_PIDK"} + configdict["BasicVariables"]["nTracks"] = { "Range" : [15.0, 1000.0 ], "InputName" : "nTracks"} + configdict["BasicVariables"]["BeautyTime"] = { "Range" : [0.4, 15.0 ], "InputName" : "lab0_LifetimeFitConsD_ctau"} + configdict["BasicVariables"]["BeautyTimeErr"] = { "Range" : [0.01, 0.1 ], "InputName" : "lab0_LifetimeFitConsD_ctauErr"} + configdict["BasicVariables"]["BDTG"] = { "Range" : [0.475, 1.0 ], "InputName" : "BDTGResponse_XGB_1"} + + configdict["AdditionalVariables"] = {} + configdict["AdditionalVariables"]["lab0_P"] = { "Range" : [ 0.0, 1600000.0 ], "InputName" : "lab0_P"} + configdict["AdditionalVariables"]["lab0_PT"] = { "Range" : [ 0.0, 40000.0 ], "InputName" : "lab0_PT"} + configdict["AdditionalVariables"]["lab0_IPCHI2_OWNPV"] = { "Range" : [ 0.0, 10000.0 ], "InputName" : "lab0_IPCHI2_OWNPV"} + configdict["AdditionalVariables"]["lab1_IPCHI2_OWNPV"] = { "Range" : [ 0.0, 180000.0 ], "InputName" : "lab1_IPCHI2_OWNPV"} + configdict["AdditionalVariables"]["lab2_P"] = { "Range" : [ 0.0, 1800000.0 ], "InputName" : "lab2_P"} + configdict["AdditionalVariables"]["lab2_PT"] = { "Range" : [ 0.0, 90000.0 ], "InputName" : "lab2_PT"} + configdict["AdditionalVariables"]["lab2_IPCHI2_OWNPV"] = { "Range" : [ 0.0, 180000.0 ], "InputName" : "lab2_IPCHI2_OWNPV"} + configdict["AdditionalVariables"]["lab3_P"] = { "Range" : [ 0.0, 1800000.0 ], "InputName" : "lab3_P"} + configdict["AdditionalVariables"]["lab3_PT"] = { "Range" : [ 0.0, 90000.0 ], "InputName" : "lab3_PT"} + configdict["AdditionalVariables"]["lab3_IPCHI2_OWNPV"] = { "Range" : [ 0.0, 180000.0 ], "InputName" : "lab3_IPCHI2_OWNPV"} + configdict["AdditionalVariables"]["lab4_P"] = { "Range" : [ 0.0, 1800000.0 ], "InputName" : "lab4_P"} + configdict["AdditionalVariables"]["lab4_PT"] = { "Range" : [ 0.0, 90000.0 ], "InputName" : "lab4_PT"} + configdict["AdditionalVariables"]["lab4_IPCHI2_OWNPV"] = { "Range" : [ 0.0, 180000.0 ], "InputName" : "lab4_IPCHI2_OWNPV"} + configdict["AdditionalVariables"]["lab5_P"] = { "Range" : [ 0.0, 1800000.0 ], "InputName" : "lab5_P"} + configdict["AdditionalVariables"]["lab5_PT"] = { "Range" : [ 0.0, 90000.0 ], "InputName" : "lab5_PT"} + configdict["AdditionalVariables"]["lab5_IPCHI2_OWNPV"] = { "Range" : [ 0.0, 180000.0 ], "InputName" : "lab5_IPCHI2_OWNPV"} + configdict["AdditionalVariables"]["lab0_DIRA_OWNPV"] = { "Range" : [ 0.0, 1.1 ], "InputName" : "lab0_DIRA_OWNPV"} + configdict["AdditionalVariables"]["lab0_LifetimeFit_Dplus_ctau"] = { "Range" : [ -50000.0, 400000.0 ], "InputName" : "lab0_LifetimeFit_Dplus_ctau"} + configdict["AdditionalVariables"]["lab0_LifetimeFit_Dplus_ctauErr"] = { "Range" : [ 0.0, 10000.0 ], "InputName" : "lab0_LifetimeFit_Dplus_ctauErr"} + configdict["AdditionalVariables"]["lab0_LifetimeFit_Dplus_decayLength"] = { "Range" : [ -50000.0, 50000.0 ], "InputName" : "lab0_LifetimeFit_Dplus_decayLength"} + configdict["AdditionalVariables"]["lab0_LifetimeFit_Dplus_decayLengthErr"] = { "Range" : [ 0.0, 2000.0 ], "InputName" : "lab0_LifetimeFit_Dplus_decayLengthErr"} + configdict["AdditionalVariables"]["lab0_LifetimeFitConsD_chi2"] = { "Range" : [ 0.0, 60000000.0 ], "InputName" : "lab0_LifetimeFitConsD_chi2"} + configdict["AdditionalVariables"]["lab0_LifetimeFitConsD_nDOF"] = { "Range" : [ -50.0, 50.0 ], "InputName" : "lab0_LifetimeFitConsD_nDOF"} + configdict["AdditionalVariables"]["lab0_ENDVERTEX_CHI2"] = { "Range" : [ 0.0, 50.0 ], "InputName" : "lab0_ENDVERTEX_CHI2"} + configdict["AdditionalVariables"]["lab2_ENDVERTEX_CHI2"] = { "Range" : [ 0.0, 50.0 ], "InputName" : "lab2_ENDVERTEX_CHI2"} + configdict["AdditionalVariables"]["lab0_LifetimeFit_chi2"] = { "Range" : [ 0.0, 10000000.0 ], "InputName" : "lab0_LifetimeFit_chi2"} + configdict["AdditionalVariables"]["lab0_LifetimeFit_nDOF"] = { "Range" : [ -50.0, 50.0 ], "InputName" : "lab0_LifetimeFit_nDOF"} + + + + + return configdict diff --git a/PhysFit/B2DXFitters/python/B2DXFitters/MDFitSettingTranslator.py b/PhysFit/B2DXFitters/python/B2DXFitters/MDFitSettingTranslator.py index a49b7817d..7f931450c 100644 --- a/PhysFit/B2DXFitters/python/B2DXFitters/MDFitSettingTranslator.py +++ b/PhysFit/B2DXFitters/python/B2DXFitters/MDFitSettingTranslator.py @@ -155,7 +155,7 @@ class Translator: else: args.append(t) tR = TString(t) - if tR.Contains("DEC") or tR.Contains("dec"): + if (tR.Contains("DECAY") == False and tR.Contains("decay") == False) and ( tR.Contains("DEC") or tR.Contains("dec")): args.append(-1.0) args.append(1.0) args.append("Additional Tagger") -- GitLab