diff --git a/parameters/dial_conversion.card b/parameters/dial_conversion.card index 64b2531..7bb5f52 100644 --- a/parameters/dial_conversion.card +++ b/parameters/dial_conversion.card @@ -1,5 +1,17 @@ # par Name Units Nominal FracErr ConvFunc -neut_parameter MaCCQE GeV 1.21*(1.0+x*0.16) +neut_parameter MaCCQE GeV 1.21*(1.0+x*0.16) niwg_parameter NIWGMEC_Norm_C12 % 100.0*(1.0+x) niwg_parameter VecFFCCQE MDLQE x -niwg_parameter CCQEFermiSurfMom MeV 217*(1.0+x*0.15) \ No newline at end of file +niwg_parameter CCQEFermiSurfMom MeV 217*(1.0+x*0.15) + + +t2k_parameter NIWG2014a_pF_C12 MeV 217*(1.0+x*0.073733) +t2k_parameter NIWG2014a_pF_O16 MeV 225*(1.0+x*0.071111) +t2k_parameter NIWGMEC_PDDWeight_C12 x 0.5*(1.0+x*1.0) +t2k_parameter NIWGMEC_PDDWeight_O16 x 0.5*(1.0+x*1.0) + +t2k_parameter NXSec_MaCCQE GeV 1.21*(1.0+x*0.165289256) + +t2k_parameter NXSec_MaNFFRES GeV 0.95*(1.0+x*0.157894737) +t2k_parameter NXSec_CA5RES x 1.01*(1.0+x*0.247524752) +t2k_parameter NXSec_BgSclCCRES x 1.30*(1.0+x*0.153846154) diff --git a/src/Reweight/GlobalDialList.cxx b/src/Reweight/GlobalDialList.cxx index 0db67e1..c9a0c65 100644 --- a/src/Reweight/GlobalDialList.cxx +++ b/src/Reweight/GlobalDialList.cxx @@ -1,48 +1,48 @@ #include "GlobalDialList.h" int GlobalDialList::EnumFromNameAndType(std::string name, int type) { // Setup Type Container if (fTypeEnumCont.find(type) == fTypeEnumCont.end()) { std::map temp; temp[name] = 0; fTypeEnumCont[type] = temp; } // Get Type Container std::map enumcont = fTypeEnumCont[type]; // Check name is in container, if its not add it if (enumcont.find(name) == enumcont.end()) { int index = enumcont.size(); enumcont[name] = index; fTypeEnumCont[type][name] = index; return index; } return enumcont[name]; } void GlobalDialList::RegisterDialEnum(std::string name, int type, int nuisenum) { if (std::find(fAllDialNames.begin(), fAllDialNames.end(), name) != fAllDialNames.end()) { return; } - LOG(FIT) << "Registed Dial Enum : " << name << " " << type << " " << nuisenum - << std::endl; + LOG(FIT) << "Registered Dial Enum : " << name << " " << type << " " + << nuisenum << std::endl; fAllDialNames.push_back(name); fAllDialTypes.push_back(type); fAllDialEnums.push_back(nuisenum); } /// Singleton functions GlobalDialList& Reweight::DialList() { return GlobalDialList::Get(); } GlobalDialList* GlobalDialList::m_diallistInstance = NULL; GlobalDialList& GlobalDialList::Get(void) { if (!m_diallistInstance) m_diallistInstance = new GlobalDialList; return *m_diallistInstance; }