No OneTemporary
Actions

Size

61 KB

Subscribers

None

View Options

	diff --git a/data/T2K/CCinc/CH-2017/T2K_CCINC_2DPmuCosmu_Data_FitGENIE.root b/data/T2K/CCinc/CH-2017/T2K_CCINC_2DPmuCosmu_Data_FitGENIE.root
	new file mode 100644
	index 0000000..1e37983
	Binary files /dev/null and b/data/T2K/CCinc/CH-2017/T2K_CCINC_2DPmuCosmu_Data_FitGENIE.root differ
	diff --git a/src/FCN/SampleList.cxx b/src/FCN/SampleList.cxx
	index 4050bbd..b3d5edc 100644
	--- a/src/FCN/SampleList.cxx
	+++ b/src/FCN/SampleList.cxx
	@@ -1,1308 +1,1313 @@
	#include "SampleList.h"

	#ifndef __NO_ANL__
	#include "ANL_CCQE_Evt_1DQ2_nu.h"
	#include "ANL_CCQE_XSec_1DEnu_nu.h"

	// ANL CC1ppip
	#include "ANL_CC1ppip_Evt_1DQ2_nu.h"
	#include "ANL_CC1ppip_Evt_1DcosmuStar_nu.h"
	#include "ANL_CC1ppip_Evt_1DcosmuStar_nu.h"
	#include "ANL_CC1ppip_Evt_1DcosthAdler_nu.h"
	#include "ANL_CC1ppip_Evt_1Dphi_nu.h"
	#include "ANL_CC1ppip_Evt_1Dppi_nu.h"
	#include "ANL_CC1ppip_Evt_1Dthpr_nu.h"
	#include "ANL_CC1ppip_XSec_1DEnu_nu.h"
	#include "ANL_CC1ppip_XSec_1DQ2_nu.h"
	// ANL CC1npip
	#include "ANL_CC1npip_Evt_1DQ2_nu.h"
	#include "ANL_CC1npip_Evt_1DcosmuStar_nu.h"
	#include "ANL_CC1npip_Evt_1Dppi_nu.h"
	#include "ANL_CC1npip_XSec_1DEnu_nu.h"
	// ANL CC1pi0
	#include "ANL_CC1pi0_Evt_1DQ2_nu.h"
	#include "ANL_CC1pi0_Evt_1DcosmuStar_nu.h"
	#include "ANL_CC1pi0_XSec_1DEnu_nu.h"
	// ANL NC1npip (mm, exotic!)
	#include "ANL_NC1npip_Evt_1Dppi_nu.h"
	// ANL NC1ppim (mm, exotic!)
	#include "ANL_NC1ppim_Evt_1DcosmuStar_nu.h"
	#include "ANL_NC1ppim_XSec_1DEnu_nu.h"
	// ANL CC2pi 1pim1pip (mm, even more exotic!)
	#include "ANL_CC2pi_1pim1pip_Evt_1Dpmu_nu.h"
	#include "ANL_CC2pi_1pim1pip_Evt_1Dppim_nu.h"
	#include "ANL_CC2pi_1pim1pip_Evt_1Dppip_nu.h"
	#include "ANL_CC2pi_1pim1pip_Evt_1Dpprot_nu.h"
	#include "ANL_CC2pi_1pim1pip_XSec_1DEnu_nu.h"
	// ANL CC2pi 1pip1pip (mm, even more exotic!)
	#include "ANL_CC2pi_1pip1pip_Evt_1Dpmu_nu.h"
	#include "ANL_CC2pi_1pip1pip_Evt_1Dpneut_nu.h"
	#include "ANL_CC2pi_1pip1pip_Evt_1DppipHigh_nu.h"
	#include "ANL_CC2pi_1pip1pip_Evt_1DppipLow_nu.h"
	#include "ANL_CC2pi_1pip1pip_XSec_1DEnu_nu.h"
	// ANL CC2pi 1pip1pi0 (mm, even more exotic!)
	#include "ANL_CC2pi_1pip1pi0_Evt_1Dpmu_nu.h"
	#include "ANL_CC2pi_1pip1pi0_Evt_1Dppi0_nu.h"
	#include "ANL_CC2pi_1pip1pi0_Evt_1Dppip_nu.h"
	#include "ANL_CC2pi_1pip1pi0_Evt_1Dpprot_nu.h"
	#include "ANL_CC2pi_1pip1pi0_XSec_1DEnu_nu.h"
	#endif

	#ifndef __NO_ArgoNeuT__
	// ArgoNeuT CC-inclusive
	#include "ArgoNeuT_CCInc_XSec_1Dpmu_antinu.h"
	#include "ArgoNeuT_CCInc_XSec_1Dpmu_nu.h"
	#include "ArgoNeuT_CCInc_XSec_1Dthetamu_antinu.h"
	#include "ArgoNeuT_CCInc_XSec_1Dthetamu_nu.h"
	#endif

	#ifndef __NO_BNL__
	// BNL CCQE
	#include "BNL_CCQE_Evt_1DQ2_nu.h"
	#include "BNL_CCQE_XSec_1DEnu_nu.h"
	// BNL CC1ppip
	#include "BNL_CC1ppip_Evt_1DQ2_nu.h"
	#include "BNL_CC1ppip_Evt_1DQ2_nu.h"
	#include "BNL_CC1ppip_Evt_1DcosthAdler_nu.h"
	#include "BNL_CC1ppip_Evt_1Dphi_nu.h"
	#include "BNL_CC1ppip_XSec_1DEnu_nu.h"
	// BNL CC1npip
	#include "BNL_CC1npip_Evt_1DQ2_nu.h"
	#include "BNL_CC1npip_XSec_1DEnu_nu.h"
	// BNL CC1pi0
	#include "BNL_CC1pi0_Evt_1DQ2_nu.h"
	#include "BNL_CC1pi0_XSec_1DEnu_nu.h"
	#endif

	#ifndef __NO_FNAL__
	// FNAL CCQE
	#include "FNAL_CCQE_Evt_1DQ2_nu.h"
	// FNAL CC1ppip
	#include "FNAL_CC1ppip_Evt_1DQ2_nu.h"
	#include "FNAL_CC1ppip_XSec_1DEnu_nu.h"
	#include "FNAL_CC1ppip_XSec_1DQ2_nu.h"
	// FNAL CC1ppim
	#include "FNAL_CC1ppim_XSec_1DEnu_antinu.h"
	#endif

	#ifndef __NO_BEBC__
	// BEBC CCQE
	#include "BEBC_CCQE_XSec_1DQ2_nu.h"
	// BEBC CC1ppip
	#include "BEBC_CC1ppip_XSec_1DEnu_nu.h"
	#include "BEBC_CC1ppip_XSec_1DQ2_nu.h"
	// BEBC CC1npip
	#include "BEBC_CC1npip_XSec_1DEnu_nu.h"
	#include "BEBC_CC1npip_XSec_1DQ2_nu.h"
	// BEBC CC1pi0
	#include "BEBC_CC1pi0_XSec_1DEnu_nu.h"
	#include "BEBC_CC1pi0_XSec_1DQ2_nu.h"
	// BEBC CC1npim
	#include "BEBC_CC1npim_XSec_1DEnu_antinu.h"
	#include "BEBC_CC1npim_XSec_1DQ2_antinu.h"
	// BEBC CC1ppim
	#include "BEBC_CC1ppim_XSec_1DEnu_antinu.h"
	#include "BEBC_CC1ppim_XSec_1DQ2_antinu.h"
	#endif

	#ifndef __NO_GGM__
	// GGM CC1ppip
	#include "GGM_CC1ppip_Evt_1DQ2_nu.h"
	#include "GGM_CC1ppip_XSec_1DEnu_nu.h"
	#endif

	#ifndef __NO_MiniBooNE__
	// MiniBooNE CCQE
	#include "MiniBooNE_CCQE_XSec_1DQ2_antinu.h"
	#include "MiniBooNE_CCQE_XSec_1DQ2_nu.h"
	#include "MiniBooNE_CCQE_XSec_2DTcos_antinu.h"
	#include "MiniBooNE_CCQE_XSec_2DTcos_antinu.h"
	#include "MiniBooNE_CCQE_XSec_2DTcos_nu.h"

	// MiniBooNE CC1pi+ 1D
	#include "MiniBooNE_CC1pip_XSec_1DEnu_nu.h"
	#include "MiniBooNE_CC1pip_XSec_1DQ2_nu.h"
	#include "MiniBooNE_CC1pip_XSec_1DTpi_nu.h"
	#include "MiniBooNE_CC1pip_XSec_1DTu_nu.h"
	// MiniBooNE CC1pi+ 2D
	#include "MiniBooNE_CC1pip_XSec_2DQ2Enu_nu.h"
	#include "MiniBooNE_CC1pip_XSec_2DTpiCospi_nu.h"
	#include "MiniBooNE_CC1pip_XSec_2DTpiEnu_nu.h"
	#include "MiniBooNE_CC1pip_XSec_2DTuCosmu_nu.h"
	#include "MiniBooNE_CC1pip_XSec_2DTuEnu_nu.h"

	// MiniBooNE CC1pi0
	#include "MiniBooNE_CC1pi0_XSec_1DEnu_nu.h"
	#include "MiniBooNE_CC1pi0_XSec_1DQ2_nu.h"
	#include "MiniBooNE_CC1pi0_XSec_1DTu_nu.h"
	#include "MiniBooNE_CC1pi0_XSec_1Dcosmu_nu.h"
	#include "MiniBooNE_CC1pi0_XSec_1Dcospi0_nu.h"
	#include "MiniBooNE_CC1pi0_XSec_1Dppi0_nu.h"
	#include "MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu.h"
	#include "MiniBooNE_NC1pi0_XSec_1Dcospi0_nu.h"
	#include "MiniBooNE_NC1pi0_XSec_1Dppi0_antinu.h"
	#include "MiniBooNE_NC1pi0_XSec_1Dppi0_nu.h"

	// MiniBooNE NC1pi0
	//#include "MiniBooNE_NCpi0_XSec_1Dppi0_nu.h"

	// MiniBooNE NCEL
	#include "MiniBooNE_NCEL_XSec_Treco_nu.h"
	#endif

	#ifndef __NO_MINERvA__
	// MINERvA CCQE
	#include "MINERvA_CCQE_XSec_1DQ2_antinu.h"
	#include "MINERvA_CCQE_XSec_1DQ2_joint.h"
	#include "MINERvA_CCQE_XSec_1DQ2_nu.h"

	// MINERvA CC0pi
	#include "MINERvA_CC0pi_XSec_1DEe_nue.h"
	#include "MINERvA_CC0pi_XSec_1DQ2_nu_proton.h"
	#include "MINERvA_CC0pi_XSec_1DQ2_nue.h"
	#include "MINERvA_CC0pi_XSec_1DThetae_nue.h"

	// MINERvA CC1pi+
	#include "MINERvA_CC1pip_XSec_1DTpi_20deg_nu.h"
	#include "MINERvA_CC1pip_XSec_1DTpi_nu.h"
	#include "MINERvA_CC1pip_XSec_1Dth_20deg_nu.h"
	#include "MINERvA_CC1pip_XSec_1Dth_nu.h"
	// 2017 data update
	#include "MINERvA_CC1pip_XSec_1D_2017Update.h"

	// MINERvA CCNpi+
	#include "MINERvA_CCNpip_XSec_1DEnu_nu.h"
	#include "MINERvA_CCNpip_XSec_1DQ2_nu.h"
	#include "MINERvA_CCNpip_XSec_1DTpi_nu.h"
	#include "MINERvA_CCNpip_XSec_1Dpmu_nu.h"
	#include "MINERvA_CCNpip_XSec_1Dth_nu.h"
	#include "MINERvA_CCNpip_XSec_1Dthmu_nu.h"

	// MINERvA CC1pi0
	#include "MINERvA_CC1pi0_XSec_1DEnu_antinu.h"
	#include "MINERvA_CC1pi0_XSec_1DQ2_antinu.h"
	#include "MINERvA_CC1pi0_XSec_1DTpi0_antinu.h"
	#include "MINERvA_CC1pi0_XSec_1Dpmu_antinu.h"
	#include "MINERvA_CC1pi0_XSec_1Dppi0_antinu.h"
	#include "MINERvA_CC1pi0_XSec_1Dth_antinu.h"
	#include "MINERvA_CC1pi0_XSec_1Dthmu_antinu.h"

	// MINERvA CC1pi0 neutrino
	#include "MINERvA_CC1pi0_XSec_1D_nu.h"

	// MINERvA CCINC
	#include "MINERvA_CCinc_XSec_1DEnu_ratio.h"
	#include "MINERvA_CCinc_XSec_1Dx_ratio.h"
	#include "MINERvA_CCinc_XSec_2DEavq3_nu.h"

	// MINERvA CCDIS
	#include "MINERvA_CCDIS_XSec_1DEnu_ratio.h"
	#include "MINERvA_CCDIS_XSec_1Dx_ratio.h"

	// MINERvA CCCOH pion
	#include "MINERvA_CCCOHPI_XSec_1DEnu_antinu.h"
	#include "MINERvA_CCCOHPI_XSec_1DEnu_antinu.h"
	#include "MINERvA_CCCOHPI_XSec_1DEpi_antinu.h"
	#include "MINERvA_CCCOHPI_XSec_1DQ2_antinu.h"

	#include "MINERvA_CCCOHPI_XSec_1DEpi_nu.h"
	#include "MINERvA_CCCOHPI_XSec_1DQ2_nu.h"
	#include "MINERvA_CCCOHPI_XSec_1Dth_nu.h"
	#include "MINERvA_CCCOHPI_XSec_1Dth_nu.h"

	#include "MINERvA_CCCOHPI_XSec_joint.h"

	#include "MINERvA_CC0pi_XSec_1DQ2_TgtRatio_nu.h"
	#include "MINERvA_CC0pi_XSec_1DQ2_Tgt_nu.h"

	#include "MINERvA_CC0pi_XSec_2Dptpx_antinu.h"
	#include "MINERvA_CC0pi_XSec_2Dptpx_nu.h"

	#endif

	#ifndef __NO_T2K__
	// T2K CC0pi
	#include "T2K_CC0pi_XSec_2DPcos_nu.h"

	+// T2K CCinc
	+#include "T2K_CCinc_XSec_2DPcos_nu_nonuniform.h"
	+
	// T2K CC1pi+ on CH
	#include "T2K_CC1pip_CH_XSec_1DQ2_nu.h"
	#include "T2K_CC1pip_CH_XSec_1DWrec_nu.h"
	#include "T2K_CC1pip_CH_XSec_1Dpmu_nu.h"
	#include "T2K_CC1pip_CH_XSec_1Dppi_nu.h"
	#include "T2K_CC1pip_CH_XSec_1Dq3_nu.h"
	#include "T2K_CC1pip_CH_XSec_1Dthmupi_nu.h"
	#include "T2K_CC1pip_CH_XSec_1Dthpi_nu.h"
	#include "T2K_CC1pip_CH_XSec_1Dthq3pi_nu.h"

	// T2K CC1pi+ on H2O
	#include "T2K_CC1pip_H2O_XSec_1DEnuDelta_nu.h"
	#include "T2K_CC1pip_H2O_XSec_1DEnuMB_nu.h"
	#include "T2K_CC1pip_H2O_XSec_1Dcosmu_nu.h"
	#include "T2K_CC1pip_H2O_XSec_1Dcosmupi_nu.h"
	#include "T2K_CC1pip_H2O_XSec_1Dcospi_nu.h"
	#include "T2K_CC1pip_H2O_XSec_1Dpmu_nu.h"
	#include "T2K_CC1pip_H2O_XSec_1Dppi_nu.h"

	// T2K STV CC0pi
	#include "T2K_CC0pinp_STV_XSec_1Ddpt_nu.h"

	#include "T2K_CC0pi_XSec_2DPcos_nu_nonuniform.h"

	#endif

	#ifndef __NO_SciBooNE__

	// SciBooNE COH studies
	#include "SciBooNE_CCCOH_1TRK_1DQ2_nu.h"
	#include "SciBooNE_CCCOH_MuPiNoVA_1DQ2_nu.h"
	#include "SciBooNE_CCCOH_MuPiNoVA_1Dthetapi_nu.h"
	#include "SciBooNE_CCCOH_MuPiNoVA_1Dthetapr_nu.h"
	#include "SciBooNE_CCCOH_MuPiVA_1DQ2_nu.h"
	#include "SciBooNE_CCCOH_MuPr_1DQ2_nu.h"
	#include "SciBooNE_CCCOH_STOPFINAL_1DQ2_nu.h"
	#include "SciBooNE_CCCOH_STOP_NTrks_nu.h"
	#endif

	#ifndef __NO_K2K__
	// K2K NC1pi0
	#include "K2K_NC1pi0_Evt_1Dppi0_nu.h"
	#endif

	// MC Studies
	#include "ExpMultDist_CCQE_XSec_1DVar_FakeStudy.h"
	#include "ExpMultDist_CCQE_XSec_2DVar_FakeStudy.h"
	#include "MCStudy_CCQEHistograms.h"

	#include "GenericFlux_Tester.h"
	#include "GenericFlux_Vectors.h"

	#include "ElectronFlux_FlatTree.h"
	#include "ElectronScattering_DurhamData.h"
	#include "MCStudy_KaonPreSelection.h"
	#include "MCStudy_MuonValidation.h"

	#include "OfficialNIWGPlots.h"
	#include "T2K2017_FakeData.h"

	#include "Simple_Osc.h"
	#include "Smear_SVDUnfold_Propagation_Osc.h"

	#include "FitWeight.h"

	#include "NuisConfig.h"
	#include "NuisKey.h"

	#ifdef __USE_DYNSAMPLES__

	#include "TRegexp.h"

	#include <dirent.h>

	// linux
	#include <dlfcn.h>

	DynamicSampleFactory::DynamicSampleFactory() : NSamples(0), NManifests(0) {
	LoadPlugins();
	QLOG(FIT, "Loaded " << NSamples << " from " << NManifests
	<< " shared object libraries.");
	}
	DynamicSampleFactory* DynamicSampleFactory::glblDSF = NULL;
	DynamicSampleFactory::PluginManifest::~PluginManifest() {
	for (size_t i_it = 0; i_it < Instances.size(); ++i_it) {
	(*(DSF_DestroySample))(Instances[i_it]);
	}
	}
	std::string EnsureTrailingSlash(std::string const& inp) {
	if (!inp.length()) {
	return "/";
	}
	if (inp[inp.length() - 1] == '/') {
	return inp;
	}
	return inp + "/";
	}
	void DynamicSampleFactory::LoadPlugins() {
	std::vector<std::string> SearchDirectories;

	if (Config::HasPar("dynamic_sample.path")) {
	SearchDirectories =
	GeneralUtils::ParseToStr(Config::GetParS("dynamic_sample.path"), ":");
	}

	char const* envPath = getenv("NUISANCE_DS_PATH");
	if (envPath) {
	std::vector<std::string> envPaths = GeneralUtils::ParseToStr(envPath, ":");
	for (size_t ep_it = 0; ep_it < envPaths.size(); ++ep_it) {
	SearchDirectories.push_back(envPaths[ep_it]);
	}
	}

	if (!SearchDirectories.size()) {
	char const* pwdPath = getenv("PWD");
	if (pwdPath) {
	SearchDirectories.push_back(pwdPath);
	}
	}

	for (size_t sp_it = 0; sp_it < SearchDirectories.size(); ++sp_it) {
	std::string dirpath = EnsureTrailingSlash(SearchDirectories[sp_it]);

	QLOG(FIT, "Searching for dynamic sample manifests in: " << dirpath);

	Ssiz_t len = 0;
	DIR* dir;
	struct dirent* ent;
	dir = opendir(dirpath.c_str());
	if (dir != NULL) {
	TRegexp matchExp("*.so", true);
	while ((ent = readdir(dir)) != NULL) {
	if (matchExp.Index(TString(ent->d_name), &len) != Ssiz_t(-1)) {
	QLOG(FIT, "\tFound shared object: "
	<< ent->d_name << " checking for relevant methods...");

	void* dlobj =
	dlopen((dirpath + ent->d_name).c_str(), RTLD_NOW \| RTLD_GLOBAL);
	char const* dlerr_cstr = dlerror();
	std::string dlerr;
	if (dlerr_cstr) {
	dlerr = dlerr_cstr;
	}

	if (dlerr.length()) {
	ERROR(WRN, "\tDL Load Error: " << dlerr);
	continue;
	}

	PluginManifest plgManif;
	plgManif.dllib = dlobj;
	plgManif.soloc = (dirpath + ent->d_name);

	plgManif.DSF_NSamples =
	reinterpret_cast<DSF_NSamples_ptr>(dlsym(dlobj, "DSF_NSamples"));

	dlerr = "";
	dlerr_cstr = dlerror();
	if (dlerr_cstr) {
	dlerr = dlerr_cstr;
	}

	if (dlerr.length()) {
	ERROR(WRN, "\tFailed to load symbol \"DSF_NSamples\" from "
	<< (dirpath + ent->d_name) << ": " << dlerr);
	dlclose(dlobj);
	continue;
	}

	plgManif.DSF_GetSampleName = reinterpret_cast<DSF_GetSampleName_ptr>(
	dlsym(dlobj, "DSF_GetSampleName"));

	dlerr = "";
	dlerr_cstr = dlerror();
	if (dlerr_cstr) {
	dlerr = dlerr_cstr;
	}

	if (dlerr.length()) {
	ERROR(WRN, "\tFailed to load symbol \"DSF_GetSampleName\" from "
	<< (dirpath + ent->d_name) << ": " << dlerr);
	dlclose(dlobj);
	continue;
	}

	plgManif.DSF_GetSample = reinterpret_cast<DSF_GetSample_ptr>(
	dlsym(dlobj, "DSF_GetSample"));

	dlerr = "";
	dlerr_cstr = dlerror();
	if (dlerr_cstr) {
	dlerr = dlerr_cstr;
	}

	if (dlerr.length()) {
	ERROR(WRN, "\tFailed to load symbol \"DSF_GetSample\" from "
	<< (dirpath + ent->d_name) << ": " << dlerr);
	dlclose(dlobj);
	continue;
	}

	plgManif.DSF_DestroySample = reinterpret_cast<DSF_DestroySample_ptr>(
	dlsym(dlobj, "DSF_DestroySample"));

	dlerr = "";
	dlerr_cstr = dlerror();
	if (dlerr_cstr) {
	dlerr = dlerr_cstr;
	}

	if (dlerr.length()) {
	ERROR(WRN, "Failed to load symbol \"DSF_DestroySample\" from "
	<< (dirpath + ent->d_name) << ": " << dlerr);
	dlclose(dlobj);
	continue;
	}

	plgManif.NSamples = (*(plgManif.DSF_NSamples))();
	QLOG(FIT, "\tSuccessfully loaded dynamic sample manifest: "
	<< plgManif.soloc << ". Contains " << plgManif.NSamples
	<< " samples.");

	for (size_t smp_it = 0; smp_it < plgManif.NSamples; ++smp_it) {
	char const* smp_name = (*(plgManif.DSF_GetSampleName))(smp_it);
	if (!smp_name) {
	THROW("Could not load sample " << smp_it << " / "
	<< plgManif.NSamples << " from "
	<< plgManif.soloc);
	}

	if (Samples.count(smp_name)) {
	ERROR(WRN, "Already loaded a sample named: \""
	<< smp_name << "\". cannot load duplciates. This "
	"sample will be skipped.");
	continue;
	}

	plgManif.SamplesProvided.push_back(smp_name);
	Samples[smp_name] = std::make_pair(plgManif.soloc, smp_it);
	QLOG(FIT, "\t\t" << smp_name);
	}

	if (plgManif.SamplesProvided.size()) {
	Manifests[plgManif.soloc] = plgManif;

	NSamples += plgManif.SamplesProvided.size();
	NManifests++;
	} else {
	dlclose(dlobj);
	}
	}
	}
	closedir(dir);
	} else {
	ERROR(WRN, "Tried to open non-existant directory.");
	}
	}
	}
	DynamicSampleFactory& DynamicSampleFactory::Get() {
	if (!glblDSF) {
	glblDSF = new DynamicSampleFactory();
	}
	return *glblDSF;
	}
	void DynamicSampleFactory::Print() {
	std::map<std::string, std::vector<std::string> > ManifestSamples;

	for (std::map<std::string, std::pair<std::string, int> >::iterator smp_it =
	Samples.begin();
	smp_it != Samples.end(); ++smp_it) {
	if (!ManifestSamples.count(smp_it->second.first)) {
	ManifestSamples[smp_it->second.first] = std::vector<std::string>();
	}
	ManifestSamples[smp_it->second.first].push_back(smp_it->first);
	}

	QLOG(FIT, "Dynamic sample manifest: ");
	for (std::map<std::string, std::vector<std::string> >::iterator m_it =
	ManifestSamples.begin();
	m_it != ManifestSamples.end(); ++m_it) {
	QLOG(FIT, "\tLibrary " << m_it->first << " contains: ");
	for (size_t s_it = 0; s_it < m_it->second.size(); ++s_it) {
	QLOG(FIT, "\t\t" << m_it->second[s_it]);
	}
	}
	}
	bool DynamicSampleFactory::HasSample(std::string const& name) {
	return Samples.count(name);
	}
	bool DynamicSampleFactory::HasSample(nuiskey& samplekey) {
	return HasSample(samplekey.GetS("name"));
	}
	MeasurementBase* DynamicSampleFactory::CreateSample(nuiskey& samplekey) {
	if (!HasSample(samplekey)) {
	ERROR(WRN, "Asked to load unknown sample: \"" << samplekey.GetS("name")
	<< "\".");
	return NULL;
	}

	std::pair<std::string, int> sample = Samples[samplekey.GetS("name")];
	QLOG(SAM, "\tLoading sample " << sample.second << " from " << sample.first);

	return (*(Manifests[sample.first].DSF_GetSample))(sample.second, &samplekey);
	}

	DynamicSampleFactory::~DynamicSampleFactory() { Manifests.clear(); }

	#endif

	//! Functions to make it easier for samples to be created and handled.
	namespace SampleUtils {

	//! Create a given sample given its name, file, type, fakdata(fkdt) file and the
	//! current rw engine and push it back into the list fChain.
	MeasurementBase* CreateSample(std::string name, std::string file,
	std::string type, std::string fkdt,
	FitWeight* rw) {
	nuiskey samplekey = Config::CreateKey("sample");
	samplekey.Set("name", name);
	samplekey.Set("input", file);
	samplekey.Set("type", type);

	return CreateSample(samplekey);
	}

	MeasurementBase* CreateSample(nuiskey samplekey) {
	#ifdef __USE_DYNSAMPLES__
	if (DynamicSampleFactory::Get().HasSample(samplekey)) {
	QLOG(SAM, "Instantiating dynamic sample...");

	MeasurementBase* ds = DynamicSampleFactory::Get().CreateSample(samplekey);
	if (ds) {
	QLOG(SAM, "Done.");
	return ds;
	}
	THROW("Failed to instantiate dynamic sample.");
	}
	#endif

	FitWeight* rw = FitBase::GetRW();
	std::string name = samplekey.GetS("name");
	std::string file = samplekey.GetS("input");
	std::string type = samplekey.GetS("type");
	std::string fkdt = "";

	/*
	ANL CCQE Samples
	*/

	#ifndef __NO_ANL__
	if (!name.compare("ANL_CCQE_XSec_1DEnu_nu") \|\|
	!name.compare("ANL_CCQE_XSec_1DEnu_nu_PRD26") \|\|
	!name.compare("ANL_CCQE_XSec_1DEnu_nu_PRL31") \|\|
	!name.compare("ANL_CCQE_XSec_1DEnu_nu_PRD16")) {
	return (new ANL_CCQE_XSec_1DEnu_nu(samplekey));
	} else if (!name.compare("ANL_CCQE_Evt_1DQ2_nu") \|\|
	!name.compare("ANL_CCQE_Evt_1DQ2_nu_PRL31") \|\|
	!name.compare("ANL_CCQE_Evt_1DQ2_nu_PRD26") \|\|
	!name.compare("ANL_CCQE_Evt_1DQ2_nu_PRD16")) {
	return (new ANL_CCQE_Evt_1DQ2_nu(samplekey));
	/*
	ANL CC1ppip samples
	*/
	} else if (!name.compare("ANL_CC1ppip_XSec_1DEnu_nu") \|\|
	!name.compare("ANL_CC1ppip_XSec_1DEnu_nu_W14Cut") \|\|
	!name.compare("ANL_CC1ppip_XSec_1DEnu_nu_Uncorr") \|\|
	!name.compare("ANL_CC1ppip_XSec_1DEnu_nu_W14Cut_Uncorr") \|\|
	!name.compare("ANL_CC1ppip_XSec_1DEnu_nu_W16Cut_Uncorr")) {
	return (new ANL_CC1ppip_XSec_1DEnu_nu(samplekey));
	} else if (!name.compare("ANL_CC1ppip_XSec_1DQ2_nu")) {
	return (new ANL_CC1ppip_XSec_1DQ2_nu(samplekey));
	} else if (!name.compare("ANL_CC1ppip_Evt_1DQ2_nu") \|\|
	!name.compare("ANL_CC1ppip_Evt_1DQ2_nu_W14Cut")) {
	return (new ANL_CC1ppip_Evt_1DQ2_nu(samplekey));
	} else if (!name.compare("ANL_CC1ppip_Evt_1Dppi_nu")) {
	return (new ANL_CC1ppip_Evt_1Dppi_nu(samplekey));
	} else if (!name.compare("ANL_CC1ppip_Evt_1Dthpr_nu")) {
	return (new ANL_CC1ppip_Evt_1Dthpr_nu(samplekey));
	} else if (!name.compare("ANL_CC1ppip_Evt_1DcosmuStar_nu")) {
	return (new ANL_CC1ppip_Evt_1DcosmuStar_nu(samplekey));
	} else if (!name.compare("ANL_CC1ppip_Evt_1DcosthAdler_nu")) {
	return (new ANL_CC1ppip_Evt_1DcosthAdler_nu(samplekey));
	} else if (!name.compare("ANL_CC1ppip_Evt_1Dphi_nu")) {
	return (new ANL_CC1ppip_Evt_1Dphi_nu(samplekey));
	/*
	ANL CC1npip sample
	*/
	} else if (!name.compare("ANL_CC1npip_XSec_1DEnu_nu") \|\|
	!name.compare("ANL_CC1npip_XSec_1DEnu_nu_W14Cut") \|\|
	!name.compare("ANL_CC1npip_XSec_1DEnu_nu_Uncorr") \|\|
	!name.compare("ANL_CC1npip_XSec_1DEnu_nu_W14Cut_Uncorr") \|\|
	!name.compare("ANL_CC1npip_XSec_1DEnu_nu_W16Cut_Uncorr")) {
	return (new ANL_CC1npip_XSec_1DEnu_nu(samplekey));
	} else if (!name.compare("ANL_CC1npip_Evt_1DQ2_nu") \|\|
	!name.compare("ANL_CC1npip_Evt_1DQ2_nu_W14Cut")) {
	return (new ANL_CC1npip_Evt_1DQ2_nu(samplekey));
	} else if (!name.compare("ANL_CC1npip_Evt_1Dppi_nu")) {
	return (new ANL_CC1npip_Evt_1Dppi_nu(samplekey));
	} else if (!name.compare("ANL_CC1npip_Evt_1DcosmuStar_nu")) {
	return (new ANL_CC1npip_Evt_1DcosmuStar_nu(samplekey));
	/*
	ANL CC1pi0 sample
	*/
	} else if (!name.compare("ANL_CC1pi0_XSec_1DEnu_nu") \|\|
	!name.compare("ANL_CC1pi0_XSec_1DEnu_nu_W14Cut") \|\|
	!name.compare("ANL_CC1pi0_XSec_1DEnu_nu_Uncorr") \|\|
	!name.compare("ANL_CC1pi0_XSec_1DEnu_nu_W14Cut_Uncorr") \|\|
	!name.compare("ANL_CC1pi0_XSec_1DEnu_nu_W16Cut_Uncorr")) {
	return (new ANL_CC1pi0_XSec_1DEnu_nu(samplekey));
	} else if (!name.compare("ANL_CC1pi0_Evt_1DQ2_nu") \|\|
	!name.compare("ANL_CC1pi0_Evt_1DQ2_nu_W14Cut")) {
	return (new ANL_CC1pi0_Evt_1DQ2_nu(samplekey));
	} else if (!name.compare("ANL_CC1pi0_Evt_1DcosmuStar_nu")) {
	return (new ANL_CC1pi0_Evt_1DcosmuStar_nu(samplekey));
	/*
	ANL NC1npip sample
	*/
	} else if (!name.compare("ANL_NC1npip_Evt_1Dppi_nu")) {
	return (new ANL_NC1npip_Evt_1Dppi_nu(samplekey));
	/*
	ANL NC1ppim sample
	*/
	} else if (!name.compare("ANL_NC1ppim_XSec_1DEnu_nu")) {
	return (new ANL_NC1ppim_XSec_1DEnu_nu(samplekey));
	} else if (!name.compare("ANL_NC1ppim_Evt_1DcosmuStar_nu")) {
	return (new ANL_NC1ppim_Evt_1DcosmuStar_nu(samplekey));
	/*
	ANL CC2pi sample
	*/
	} else if (!name.compare("ANL_CC2pi_1pim1pip_XSec_1DEnu_nu")) {
	return (new ANL_CC2pi_1pim1pip_XSec_1DEnu_nu(samplekey));
	} else if (!name.compare("ANL_CC2pi_1pim1pip_Evt_1Dpmu_nu")) {
	return (new ANL_CC2pi_1pim1pip_Evt_1Dpmu_nu(samplekey));
	} else if (!name.compare("ANL_CC2pi_1pim1pip_Evt_1Dppip_nu")) {
	return (new ANL_CC2pi_1pim1pip_Evt_1Dppip_nu(samplekey));
	} else if (!name.compare("ANL_CC2pi_1pim1pip_Evt_1Dppim_nu")) {
	return (new ANL_CC2pi_1pim1pip_Evt_1Dppim_nu(samplekey));
	} else if (!name.compare("ANL_CC2pi_1pim1pip_Evt_1Dpprot_nu")) {
	return (new ANL_CC2pi_1pim1pip_Evt_1Dpprot_nu(samplekey));

	} else if (!name.compare("ANL_CC2pi_1pip1pip_XSec_1DEnu_nu")) {
	return (new ANL_CC2pi_1pip1pip_XSec_1DEnu_nu(samplekey));
	} else if (!name.compare("ANL_CC2pi_1pip1pip_Evt_1Dpmu_nu")) {
	return (new ANL_CC2pi_1pip1pip_Evt_1Dpmu_nu(samplekey));
	} else if (!name.compare("ANL_CC2pi_1pip1pip_Evt_1Dpneut_nu")) {
	return (new ANL_CC2pi_1pip1pip_Evt_1Dpneut_nu(samplekey));
	} else if (!name.compare("ANL_CC2pi_1pip1pip_Evt_1DppipHigh_nu")) {
	return (new ANL_CC2pi_1pip1pip_Evt_1DppipHigh_nu(samplekey));
	} else if (!name.compare("ANL_CC2pi_1pip1pip_Evt_1DppipLow_nu")) {
	return (new ANL_CC2pi_1pip1pip_Evt_1DppipLow_nu(samplekey));

	} else if (!name.compare("ANL_CC2pi_1pip1pi0_XSec_1DEnu_nu")) {
	return (new ANL_CC2pi_1pip1pi0_XSec_1DEnu_nu(samplekey));
	} else if (!name.compare("ANL_CC2pi_1pip1pi0_Evt_1Dpmu_nu")) {
	return (new ANL_CC2pi_1pip1pi0_Evt_1Dpmu_nu(samplekey));
	} else if (!name.compare("ANL_CC2pi_1pip1pi0_Evt_1Dppip_nu")) {
	return (new ANL_CC2pi_1pip1pi0_Evt_1Dppip_nu(samplekey));
	} else if (!name.compare("ANL_CC2pi_1pip1pi0_Evt_1Dppi0_nu")) {
	return (new ANL_CC2pi_1pip1pi0_Evt_1Dppi0_nu(samplekey));
	} else if (!name.compare("ANL_CC2pi_1pip1pi0_Evt_1Dpprot_nu")) {
	return (new ANL_CC2pi_1pip1pi0_Evt_1Dpprot_nu(samplekey));

	/*
	ArgoNeut Samples
	*/
	} else
	#endif
	#ifndef __NO_ArgoNeuT__
	if (!name.compare("ArgoNeuT_CCInc_XSec_1Dpmu_antinu")) {
	return (new ArgoNeuT_CCInc_XSec_1Dpmu_antinu(samplekey));
	} else if (!name.compare("ArgoNeuT_CCInc_XSec_1Dpmu_nu")) {
	return (new ArgoNeuT_CCInc_XSec_1Dpmu_nu(samplekey));
	} else if (!name.compare("ArgoNeuT_CCInc_XSec_1Dthetamu_antinu")) {
	return (new ArgoNeuT_CCInc_XSec_1Dthetamu_antinu(samplekey));
	} else if (!name.compare("ArgoNeuT_CCInc_XSec_1Dthetamu_nu")) {
	return (new ArgoNeuT_CCInc_XSec_1Dthetamu_nu(samplekey));

	/*
	BNL Samples
	*/
	} else
	#endif
	#ifndef __NO_BNL__
	if (!name.compare("BNL_CCQE_XSec_1DEnu_nu")) {
	return (new BNL_CCQE_XSec_1DEnu_nu(samplekey));
	} else if (!name.compare("BNL_CCQE_Evt_1DQ2_nu")) {
	return (new BNL_CCQE_Evt_1DQ2_nu(samplekey));

	/*
	BNL CC1ppip samples
	*/
	} else if (!name.compare("BNL_CC1ppip_XSec_1DEnu_nu") \|\|
	!name.compare("BNL_CC1ppip_XSec_1DEnu_nu_Uncorr") \|\|
	!name.compare("BNL_CC1ppip_XSec_1DEnu_nu_W14Cut") \|\|
	!name.compare("BNL_CC1ppip_XSec_1DEnu_nu_W14Cut_Uncorr")) {
	return (new BNL_CC1ppip_XSec_1DEnu_nu(samplekey));
	} else if (!name.compare("BNL_CC1ppip_Evt_1DQ2_nu") \|\|
	!name.compare("BNL_CC1ppip_Evt_1DQ2_nu_W14Cut")) {
	return (new BNL_CC1ppip_Evt_1DQ2_nu(samplekey));
	} else if (!name.compare("BNL_CC1ppip_Evt_1DcosthAdler_nu")) {
	return (new BNL_CC1ppip_Evt_1DcosthAdler_nu(samplekey));
	} else if (!name.compare("BNL_CC1ppip_Evt_1Dphi_nu")) {
	return (new BNL_CC1ppip_Evt_1Dphi_nu(samplekey));

	/*
	BNL CC1npip samples
	*/
	} else if (!name.compare("BNL_CC1npip_XSec_1DEnu_nu") \|\|
	!name.compare("BNL_CC1npip_XSec_1DEnu_nu_Uncorr")) {
	return (new BNL_CC1npip_XSec_1DEnu_nu(samplekey));
	} else if (!name.compare("BNL_CC1npip_Evt_1DQ2_nu")) {
	return (new BNL_CC1npip_Evt_1DQ2_nu(samplekey));
	/*
	BNL CC1pi0 samples
	*/
	} else if (!name.compare("BNL_CC1pi0_XSec_1DEnu_nu")) {
	return (new BNL_CC1pi0_XSec_1DEnu_nu(samplekey));
	} else if (!name.compare("BNL_CC1pi0_Evt_1DQ2_nu")) {
	return (new BNL_CC1pi0_Evt_1DQ2_nu(samplekey));

	/*
	FNAL Samples
	*/
	} else
	#endif
	#ifndef __NO_FNAL__
	if (!name.compare("FNAL_CCQE_Evt_1DQ2_nu")) {
	return (new FNAL_CCQE_Evt_1DQ2_nu(samplekey));
	/*
	FNAL CC1ppip
	*/
	} else if (!name.compare("FNAL_CC1ppip_XSec_1DEnu_nu")) {
	return (new FNAL_CC1ppip_XSec_1DEnu_nu(samplekey));
	} else if (!name.compare("FNAL_CC1ppip_XSec_1DQ2_nu")) {
	return (new FNAL_CC1ppip_XSec_1DQ2_nu(samplekey));
	} else if (!name.compare("FNAL_CC1ppip_Evt_1DQ2_nu")) {
	return (new FNAL_CC1ppip_Evt_1DQ2_nu(samplekey));
	/*
	FNAL CC1ppim
	*/
	} else if (!name.compare("FNAL_CC1ppim_XSec_1DEnu_antinu")) {
	return (new FNAL_CC1ppim_XSec_1DEnu_antinu(samplekey));

	/*
	BEBC Samples
	*/
	} else
	#endif
	#ifndef __NO_BEBC__
	if (!name.compare("BEBC_CCQE_XSec_1DQ2_nu")) {
	return (new BEBC_CCQE_XSec_1DQ2_nu(samplekey));
	/*
	BEBC CC1ppip samples
	*/
	} else if (!name.compare("BEBC_CC1ppip_XSec_1DEnu_nu")) {
	return (new BEBC_CC1ppip_XSec_1DEnu_nu(samplekey));
	} else if (!name.compare("BEBC_CC1ppip_XSec_1DQ2_nu")) {
	return (new BEBC_CC1ppip_XSec_1DQ2_nu(samplekey));
	/*
	BEBC CC1npip samples
	*/
	} else if (!name.compare("BEBC_CC1npip_XSec_1DEnu_nu")) {
	return (new BEBC_CC1npip_XSec_1DEnu_nu(samplekey));
	} else if (!name.compare("BEBC_CC1npip_XSec_1DQ2_nu")) {
	return (new BEBC_CC1npip_XSec_1DQ2_nu(samplekey));
	/*
	BEBC CC1pi0 samples
	*/
	} else if (!name.compare("BEBC_CC1pi0_XSec_1DEnu_nu")) {
	return (new BEBC_CC1pi0_XSec_1DEnu_nu(samplekey));
	} else if (!name.compare("BEBC_CC1pi0_XSec_1DQ2_nu")) {
	return (new BEBC_CC1pi0_XSec_1DQ2_nu(samplekey));
	/*
	BEBC CC1npim samples
	*/
	} else if (!name.compare("BEBC_CC1npim_XSec_1DEnu_antinu")) {
	return (new BEBC_CC1npim_XSec_1DEnu_antinu(samplekey));
	} else if (!name.compare("BEBC_CC1npim_XSec_1DQ2_antinu")) {
	return (new BEBC_CC1npim_XSec_1DQ2_antinu(samplekey));
	/*
	BEBC CC1ppim samples
	*/
	} else if (!name.compare("BEBC_CC1ppim_XSec_1DEnu_antinu")) {
	return (new BEBC_CC1ppim_XSec_1DEnu_antinu(samplekey));
	} else if (!name.compare("BEBC_CC1ppim_XSec_1DQ2_antinu")) {
	return (new BEBC_CC1ppim_XSec_1DQ2_antinu(samplekey));

	/*
	GGM CC1ppip samples
	*/
	} else
	#endif
	#ifndef __NO_GGM__
	if (!name.compare("GGM_CC1ppip_XSec_1DEnu_nu")) {
	return (new GGM_CC1ppip_XSec_1DEnu_nu(samplekey));
	} else if (!name.compare("GGM_CC1ppip_Evt_1DQ2_nu")) {
	return (new GGM_CC1ppip_Evt_1DQ2_nu(samplekey));

	/*
	MiniBooNE Samples
	*/
	/*
	CCQE
	*/
	} else
	#endif
	#ifndef __NO_MiniBooNE__
	if (!name.compare("MiniBooNE_CCQE_XSec_1DQ2_nu") \|\|
	!name.compare("MiniBooNE_CCQELike_XSec_1DQ2_nu")) {
	return (new MiniBooNE_CCQE_XSec_1DQ2_nu(samplekey));
	} else if (!name.compare("MiniBooNE_CCQE_XSec_1DQ2_antinu") \|\|
	!name.compare("MiniBooNE_CCQELike_XSec_1DQ2_antinu") \|\|
	!name.compare("MiniBooNE_CCQE_CTarg_XSec_1DQ2_antinu")) {
	return (new MiniBooNE_CCQE_XSec_1DQ2_antinu(samplekey));

	} else if (!name.compare("MiniBooNE_CCQE_XSec_2DTcos_nu") \|\|
	!name.compare("MiniBooNE_CCQELike_XSec_2DTcos_nu")) {
	return (new MiniBooNE_CCQE_XSec_2DTcos_nu(samplekey));

	} else if (!name.compare("MiniBooNE_CCQE_XSec_2DTcos_antinu") \|\|
	!name.compare("MiniBooNE_CCQELike_XSec_2DTcos_antinu")) {
	return (new MiniBooNE_CCQE_XSec_2DTcos_antinu(samplekey));

	/*
	MiniBooNE CC1pi+
	*/
	// 1D
	} else if (!name.compare("MiniBooNE_CC1pip_XSec_1DEnu_nu")) {
	return (new MiniBooNE_CC1pip_XSec_1DEnu_nu(samplekey));

	} else if (!name.compare("MiniBooNE_CC1pip_XSec_1DQ2_nu")) {
	return (new MiniBooNE_CC1pip_XSec_1DQ2_nu(samplekey));

	} else if (!name.compare("MiniBooNE_CC1pip_XSec_1DTpi_nu")) {
	return (new MiniBooNE_CC1pip_XSec_1DTpi_nu(samplekey));

	} else if (!name.compare("MiniBooNE_CC1pip_XSec_1DTu_nu")) {
	return (new MiniBooNE_CC1pip_XSec_1DTu_nu(samplekey));

	// 2D
	} else if (!name.compare("MiniBooNE_CC1pip_XSec_2DQ2Enu_nu")) {
	return (new MiniBooNE_CC1pip_XSec_2DQ2Enu_nu(samplekey));

	} else if (!name.compare("MiniBooNE_CC1pip_XSec_2DTpiCospi_nu")) {
	return (new MiniBooNE_CC1pip_XSec_2DTpiCospi_nu(samplekey));

	} else if (!name.compare("MiniBooNE_CC1pip_XSec_2DTpiEnu_nu")) {
	return (new MiniBooNE_CC1pip_XSec_2DTpiEnu_nu(samplekey));

	} else if (!name.compare("MiniBooNE_CC1pip_XSec_2DTuCosmu_nu")) {
	return (new MiniBooNE_CC1pip_XSec_2DTuCosmu_nu(samplekey));

	} else if (!name.compare("MiniBooNE_CC1pip_XSec_2DTuEnu_nu")) {
	return (new MiniBooNE_CC1pip_XSec_2DTuEnu_nu(samplekey));

	/*
	MiniBooNE CC1pi0
	*/
	} else if (!name.compare("MiniBooNE_CC1pi0_XSec_1DEnu_nu")) {
	return (new MiniBooNE_CC1pi0_XSec_1DEnu_nu(samplekey));

	} else if (!name.compare("MiniBooNE_CC1pi0_XSec_1DQ2_nu")) {
	return (new MiniBooNE_CC1pi0_XSec_1DQ2_nu(samplekey));

	} else if (!name.compare("MiniBooNE_CC1pi0_XSec_1DTu_nu")) {
	return (new MiniBooNE_CC1pi0_XSec_1DTu_nu(samplekey));

	} else if (!name.compare("MiniBooNE_CC1pi0_XSec_1Dcosmu_nu")) {
	return (new MiniBooNE_CC1pi0_XSec_1Dcosmu_nu(samplekey));

	} else if (!name.compare("MiniBooNE_CC1pi0_XSec_1Dcospi0_nu")) {
	return (new MiniBooNE_CC1pi0_XSec_1Dcospi0_nu(samplekey));

	} else if (!name.compare("MiniBooNE_CC1pi0_XSec_1Dppi0_nu")) {
	return (new MiniBooNE_CC1pi0_XSec_1Dppi0_nu(samplekey));

	} else if (!name.compare("MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu") \|\|
	!name.compare("MiniBooNE_NC1pi0_XSec_1Dcospi0_rhc")) {
	return (new MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu(samplekey));

	} else if (!name.compare("MiniBooNE_NC1pi0_XSec_1Dcospi0_nu") \|\|
	!name.compare("MiniBooNE_NC1pi0_XSec_1Dcospi0_fhc")) {
	return (new MiniBooNE_NC1pi0_XSec_1Dcospi0_nu(samplekey));

	} else if (!name.compare("MiniBooNE_NC1pi0_XSec_1Dppi0_antinu") \|\|
	!name.compare("MiniBooNE_NC1pi0_XSec_1Dppi0_rhc")) {
	return (new MiniBooNE_NC1pi0_XSec_1Dppi0_antinu(samplekey));

	} else if (!name.compare("MiniBooNE_NC1pi0_XSec_1Dppi0_nu") \|\|
	!name.compare("MiniBooNE_NC1pi0_XSec_1Dppi0_fhc")) {
	return (new MiniBooNE_NC1pi0_XSec_1Dppi0_nu(samplekey));

	/*
	MiniBooNE NCEL
	*/
	} else if (!name.compare("MiniBooNE_NCEL_XSec_Treco_nu")) {
	return (new MiniBooNE_NCEL_XSec_Treco_nu(samplekey));

	/*
	MINERvA Samples
	*/
	} else
	#endif
	#ifndef __NO_MINERvA__
	if (!name.compare("MINERvA_CCQE_XSec_1DQ2_nu") \|\|
	!name.compare("MINERvA_CCQE_XSec_1DQ2_nu_20deg") \|\|
	!name.compare("MINERvA_CCQE_XSec_1DQ2_nu_oldflux") \|\|
	!name.compare("MINERvA_CCQE_XSec_1DQ2_nu_20deg_oldflux")) {
	return (new MINERvA_CCQE_XSec_1DQ2_nu(samplekey));

	} else if (!name.compare("MINERvA_CCQE_XSec_1DQ2_antinu") \|\|
	!name.compare("MINERvA_CCQE_XSec_1DQ2_antinu_20deg") \|\|
	!name.compare("MINERvA_CCQE_XSec_1DQ2_antinu_oldflux") \|\|
	!name.compare("MINERvA_CCQE_XSec_1DQ2_antinu_20deg_oldflux")) {
	return (new MINERvA_CCQE_XSec_1DQ2_antinu(samplekey));

	} else if (!name.compare("MINERvA_CCQE_XSec_1DQ2_joint_oldflux") \|\|
	!name.compare("MINERvA_CCQE_XSec_1DQ2_joint_20deg_oldflux") \|\|
	!name.compare("MINERvA_CCQE_XSec_1DQ2_joint") \|\|
	!name.compare("MINERvA_CCQE_XSec_1DQ2_joint_20deg")) {
	return (new MINERvA_CCQE_XSec_1DQ2_joint(samplekey));

	} else if (!name.compare("MINERvA_CC0pi_XSec_1DEe_nue")) {
	return (new MINERvA_CC0pi_XSec_1DEe_nue(samplekey));

	} else if (!name.compare("MINERvA_CC0pi_XSec_1DQ2_nue")) {
	return (new MINERvA_CC0pi_XSec_1DQ2_nue(samplekey));

	} else if (!name.compare("MINERvA_CC0pi_XSec_1DThetae_nue")) {
	return (new MINERvA_CC0pi_XSec_1DThetae_nue(samplekey));

	} else if (!name.compare("MINERvA_CC0pi_XSec_1DQ2_nu_proton")) {
	return (new MINERvA_CC0pi_XSec_1DQ2_nu_proton(samplekey));

	} else if (!name.compare("MINERvA_CC0pi_XSec_1DQ2_TgtC_nu") \|\|
	!name.compare("MINERvA_CC0pi_XSec_1DQ2_TgtCH_nu") \|\|
	!name.compare("MINERvA_CC0pi_XSec_1DQ2_TgtFe_nu") \|\|
	!name.compare("MINERvA_CC0pi_XSec_1DQ2_TgtPb_nu")) {
	return (new MINERvA_CC0pi_XSec_1DQ2_Tgt_nu(samplekey));

	} else if (!name.compare("MINERvA_CC0pi_XSec_1DQ2_TgtRatioC_nu") \|\|
	!name.compare("MINERvA_CC0pi_XSec_1DQ2_TgtRatioFe_nu") \|\|
	!name.compare("MINERvA_CC0pi_XSec_1DQ2_TgtRatioPb_nu")) {
	return (new MINERvA_CC0pi_XSec_1DQ2_TgtRatio_nu(samplekey));

	} else if (!name.compare("MINERvA_CC0pi_XSec_2Dptpx_nu")) {
	return (new MINERvA_CC0pi_XSec_2Dptpx_nu(samplekey));

	} else if (!name.compare("MINERvA_CC0pi_XSec_2Dptpx_antinu")) {
	return (new MINERvA_CC0pi_XSec_2Dptpx_antinu(samplekey));

	/*
	CC1pi+
	*/
	// DONE
	} else if (!name.compare("MINERvA_CC1pip_XSec_1DTpi_nu") \|\|
	!name.compare("MINERvA_CC1pip_XSec_1DTpi_nu_20deg") \|\|
	!name.compare("MINERvA_CC1pip_XSec_1DTpi_nu_fluxcorr") \|\|
	!name.compare("MINERvA_CC1pip_XSec_1DTpi_nu_20deg_fluxcorr")) {
	return (new MINERvA_CC1pip_XSec_1DTpi_nu(samplekey));

	// DONE
	} else if (!name.compare("MINERvA_CC1pip_XSec_1Dth_nu") \|\|
	!name.compare("MINERvA_CC1pip_XSec_1Dth_nu_20deg") \|\|
	!name.compare("MINERvA_CC1pip_XSec_1Dth_nu_fluxcorr") \|\|
	!name.compare("MINERvA_CC1pip_XSec_1Dth_nu_20deg_fluxcorr")) {
	return (new MINERvA_CC1pip_XSec_1Dth_nu(samplekey));

	} else if (!name.compare("MINERvA_CC1pip_XSec_1DTpi_nu_2017") \|\|
	!name.compare("MINERvA_CC1pip_XSec_1Dth_nu_2017") \|\|
	!name.compare("MINERvA_CC1pip_XSec_1Dpmu_nu_2017") \|\|
	!name.compare("MINERvA_CC1pip_XSec_1Dthmu_nu_2017") \|\|
	!name.compare("MINERvA_CC1pip_XSec_1DQ2_nu_2017") \|\|
	!name.compare("MINERvA_CC1pip_XSec_1DEnu_nu_2017")) {
	return (new MINERvA_CC1pip_XSec_1D_2017Update(samplekey));
	/*
	CCNpi+
	*/
	} else if (!name.compare("MINERvA_CCNpip_XSec_1Dth_nu") \|\|
	!name.compare("MINERvA_CCNpip_XSec_1Dth_nu_2015") \|\|
	!name.compare("MINERvA_CCNpip_XSec_1Dth_nu_2016") \|\|
	!name.compare("MINERvA_CCNpip_XSec_1Dth_nu_2015_20deg") \|\|
	!name.compare("MINERvA_CCNpip_XSec_1Dth_nu_2015_fluxcorr") \|\|
	!name.compare("MINERvA_CCNpip_XSec_1Dth_nu_2015_20deg_fluxcorr")) {
	return (new MINERvA_CCNpip_XSec_1Dth_nu(samplekey));

	} else if (!name.compare("MINERvA_CCNpip_XSec_1DTpi_nu") \|\|
	!name.compare("MINERvA_CCNpip_XSec_1DTpi_nu_2015") \|\|
	!name.compare("MINERvA_CCNpip_XSec_1DTpi_nu_2016") \|\|
	!name.compare("MINERvA_CCNpip_XSec_1DTpi_nu_2015_20deg") \|\|
	!name.compare("MINERvA_CCNpip_XSec_1DTpi_nu_2015_fluxcorr") \|\|
	!name.compare(
	"MINERvA_CCNpip_XSec_1DTpi_nu_2015_20deg_fluxcorr")) {
	return (new MINERvA_CCNpip_XSec_1DTpi_nu(samplekey));

	// Done
	} else if (!name.compare("MINERvA_CCNpip_XSec_1Dthmu_nu")) {
	return (new MINERvA_CCNpip_XSec_1Dthmu_nu(samplekey));

	// Done
	} else if (!name.compare("MINERvA_CCNpip_XSec_1Dpmu_nu")) {
	return (new MINERvA_CCNpip_XSec_1Dpmu_nu(samplekey));

	// Done
	} else if (!name.compare("MINERvA_CCNpip_XSec_1DQ2_nu")) {
	return (new MINERvA_CCNpip_XSec_1DQ2_nu(samplekey));

	// Done
	} else if (!name.compare("MINERvA_CCNpip_XSec_1DEnu_nu")) {
	return (new MINERvA_CCNpip_XSec_1DEnu_nu(samplekey));

	/*
	MINERvA CC1pi0 anti-nu
	*/
	// Done
	} else if (!name.compare("MINERvA_CC1pi0_XSec_1Dth_antinu") \|\|
	!name.compare("MINERvA_CC1pi0_XSec_1Dth_antinu_2015") \|\|
	!name.compare("MINERvA_CC1pi0_XSec_1Dth_antinu_2016") \|\|
	!name.compare("MINERvA_CC1pi0_XSec_1Dth_antinu_fluxcorr") \|\|
	!name.compare("MINERvA_CC1pi0_XSec_1Dth_antinu_2015_fluxcorr") \|\|
	!name.compare("MINERvA_CC1pi0_XSec_1Dth_antinu_2016_fluxcorr")) {
	return (new MINERvA_CC1pi0_XSec_1Dth_antinu(samplekey));

	} else if (!name.compare("MINERvA_CC1pi0_XSec_1Dppi0_antinu") \|\|
	!name.compare("MINERvA_CC1pi0_XSec_1Dppi0_antinu_fluxcorr")) {
	return (new MINERvA_CC1pi0_XSec_1Dppi0_antinu(samplekey));

	} else if (!name.compare("MINERvA_CC1pi0_XSec_1DTpi0_antinu")) {
	return (new MINERvA_CC1pi0_XSec_1DTpi0_antinu(samplekey));

	// Done
	} else if (!name.compare("MINERvA_CC1pi0_XSec_1DQ2_antinu")) {
	return (new MINERvA_CC1pi0_XSec_1DQ2_antinu(samplekey));

	// Done
	} else if (!name.compare("MINERvA_CC1pi0_XSec_1Dthmu_antinu")) {
	return (new MINERvA_CC1pi0_XSec_1Dthmu_antinu(samplekey));

	// Done
	} else if (!name.compare("MINERvA_CC1pi0_XSec_1Dpmu_antinu")) {
	return (new MINERvA_CC1pi0_XSec_1Dpmu_antinu(samplekey));

	// Done
	} else if (!name.compare("MINERvA_CC1pi0_XSec_1DEnu_antinu")) {
	return (new MINERvA_CC1pi0_XSec_1DEnu_antinu(samplekey));

	// MINERvA CC1pi0 nu
	} else if (!name.compare("MINERvA_CC1pi0_XSec_1DTpi_nu") \|\|
	!name.compare("MINERvA_CC1pi0_XSec_1Dth_nu") \|\|
	!name.compare("MINERvA_CC1pi0_XSec_1Dpmu_nu") \|\|
	!name.compare("MINERvA_CC1pi0_XSec_1Dthmu_nu") \|\|
	!name.compare("MINERvA_CC1pi0_XSec_1DQ2_nu") \|\|
	!name.compare("MINERvA_CC1pi0_XSec_1DEnu_nu") \|\|
	!name.compare("MINERvA_CC1pi0_XSec_1DWexp_nu") \|\|
	!name.compare("MINERvA_CC1pi0_XSec_1DPPi0Mass_nu") \|\|
	!name.compare("MINERvA_CC1pi0_XSec_1DPPi0MassDelta_nu") \|\|
	!name.compare("MINERvA_CC1pi0_XSec_1DCosAdler_nu") \|\|
	!name.compare("MINERvA_CC1pi0_XSec_1DPhiAdler_nu")) {
	return (new MINERvA_CC1pi0_XSec_1D_nu(samplekey));

	/*
	CCINC
	*/
	} else if (!name.compare("MINERvA_CCinc_XSec_2DEavq3_nu")) {
	return (new MINERvA_CCinc_XSec_2DEavq3_nu(samplekey));

	} else if (!name.compare("MINERvA_CCinc_XSec_1Dx_ratio_C12_CH") \|\|
	!name.compare("MINERvA_CCinc_XSec_1Dx_ratio_Fe56_CH") \|\|
	!name.compare("MINERvA_CCinc_XSec_1Dx_ratio_Pb208_CH")) {
	return (new MINERvA_CCinc_XSec_1Dx_ratio(samplekey));

	} else if (!name.compare("MINERvA_CCinc_XSec_1DEnu_ratio_C12_CH") \|\|
	!name.compare("MINERvA_CCinc_XSec_1DEnu_ratio_Fe56_CH") \|\|
	!name.compare("MINERvA_CCinc_XSec_1DEnu_ratio_Pb208_CH")) {
	return (new MINERvA_CCinc_XSec_1DEnu_ratio(samplekey));
	/*
	CCDIS
	*/
	} else if (!name.compare("MINERvA_CCDIS_XSec_1Dx_ratio_C12_CH") \|\|
	!name.compare("MINERvA_CCDIS_XSec_1Dx_ratio_Fe56_CH") \|\|
	!name.compare("MINERvA_CCDIS_XSec_1Dx_ratio_Pb208_CH")) {
	return (new MINERvA_CCDIS_XSec_1Dx_ratio(samplekey));

	} else if (!name.compare("MINERvA_CCDIS_XSec_1DEnu_ratio_C12_CH") \|\|
	!name.compare("MINERvA_CCDIS_XSec_1DEnu_ratio_Fe56_CH") \|\|
	!name.compare("MINERvA_CCDIS_XSec_1DEnu_ratio_Pb208_CH")) {
	return (new MINERvA_CCDIS_XSec_1DEnu_ratio(samplekey));

	/*
	CC-COH
	*/
	} else if (!name.compare("MINERvA_CCCOHPI_XSec_1DEnu_nu")) {
	return (new MINERvA_CCCOHPI_XSec_1DEnu_nu(samplekey));
	} else if (!name.compare("MINERvA_CCCOHPI_XSec_1DEpi_nu")) {
	return (new MINERvA_CCCOHPI_XSec_1DEpi_nu(samplekey));
	} else if (!name.compare("MINERvA_CCCOHPI_XSec_1Dth_nu")) {
	return (new MINERvA_CCCOHPI_XSec_1Dth_nu(samplekey));
	} else if (!name.compare("MINERvA_CCCOHPI_XSec_1DQ2_nu")) {
	return (new MINERvA_CCCOHPI_XSec_1DQ2_nu(samplekey));
	} else if (!name.compare("MINERvA_CCCOHPI_XSec_1DEnu_antinu")) {
	return (new MINERvA_CCCOHPI_XSec_1DEnu_antinu(samplekey));
	} else if (!name.compare("MINERvA_CCCOHPI_XSec_1DEpi_antinu")) {
	return (new MINERvA_CCCOHPI_XSec_1DEpi_antinu(samplekey));
	} else if (!name.compare("MINERvA_CCCOHPI_XSec_1Dth_antinu")) {
	return (new MINERvA_CCCOHPI_XSec_1Dth_antinu(samplekey));
	} else if (!name.compare("MINERvA_CCCOHPI_XSec_1DQ2_antinu")) {
	return (new MINERvA_CCCOHPI_XSec_1DQ2_antinu(samplekey));

	} else if (!name.compare("MINERvA_CCCOHPI_XSec_1DEnu_joint")) {
	return (new MINERvA_CCCOHPI_XSec_joint(samplekey));
	} else if (!name.compare("MINERvA_CCCOHPI_XSec_1DEpi_joint")) {
	return (new MINERvA_CCCOHPI_XSec_joint(samplekey));
	} else if (!name.compare("MINERvA_CCCOHPI_XSec_1Dth_joint")) {
	return (new MINERvA_CCCOHPI_XSec_joint(samplekey));
	} else if (!name.compare("MINERvA_CCCOHPI_XSec_1DQ2_joint")) {
	return (new MINERvA_CCCOHPI_XSec_joint(samplekey));

	/*
	T2K Samples
	*/

	} else
	#endif
	#ifndef __NO_T2K__
	if (!name.compare("T2K_CC0pi_XSec_2DPcos_nu") \|\|
	!name.compare("T2K_CC0pi_XSec_2DPcos_nu_I") \|\|
	!name.compare("T2K_CC0pi_XSec_2DPcos_nu_II")) {
	return (new T2K_CC0pi_XSec_2DPcos_nu(samplekey));

	} else if (!name.compare("T2K_CC0pi_XSec_2DPcos_nu_nonuniform")) {
	return (new T2K_CC0pi_XSec_2DPcos_nu_nonuniform(samplekey));

	+ } else if (!name.compare("T2K_CCinc_XSec_2DPcos_nu_nonuniform")) {
	+ return (new T2K_CCinc_XSec_2DPcos_nu_nonuniform(samplekey));
	/*
	T2K CC1pi+ CH samples
	*/
	// Comment these out for now because we don't have the proper data
	/*

	} else if (!name.compare("T2K_CC1pip_CH_XSec_1Dpmu_nu")) {
	return (new T2K_CC1pip_CH_XSec_1Dpmu_nu(file, rw, type, fkdt));

	} else if (!name.compare("T2K_CC1pip_CH_XSec_1Dppi_nu")) {
	return (new T2K_CC1pip_CH_XSec_1Dppi_nu(file, rw, type, fkdt));

	} else if (!name.compare("T2K_CC1pip_CH_XSec_1DQ2_nu")) {
	return (new T2K_CC1pip_CH_XSec_1DQ2_nu(file, rw, type, fkdt));

	} else if (!name.compare("T2K_CC1pip_CH_XSec_1Dq3_nu")) {
	return (new T2K_CC1pip_CH_XSec_1Dq3_nu(file, rw, type, fkdt));

	} else if (!name.compare("T2K_CC1pip_CH_XSec_1Dthmupi_nu")) {
	return (new T2K_CC1pip_CH_XSec_1Dthmupi_nu(file, rw, type, fkdt));

	} else if (!name.compare("T2K_CC1pip_CH_XSec_1Dthpi_nu")) {
	return (new T2K_CC1pip_CH_XSec_1Dthpi_nu(file, rw, type, fkdt));

	} else if (!name.compare("T2K_CC1pip_CH_XSec_1Dthq3pi_nu")) {
	return (new T2K_CC1pip_CH_XSec_1Dthq3pi_nu(file, rw, type, fkdt));

	} else if (!name.compare("T2K_CC1pip_CH_XSec_1DWrec_nu")) {
	return (new T2K_CC1pip_CH_XSec_1DWrec_nu(file, rw, type, fkdt));
	*/

	/*
	T2K CC1pi+ H2O samples
	*/
	} else if (!name.compare("T2K_CC1pip_H2O_XSec_1DEnuDelta_nu")) {
	return (new T2K_CC1pip_H2O_XSec_1DEnuDelta_nu(samplekey));

	} else if (!name.compare("T2K_CC1pip_H2O_XSec_1DEnuMB_nu")) {
	return (new T2K_CC1pip_H2O_XSec_1DEnuMB_nu(samplekey));

	} else if (!name.compare("T2K_CC1pip_H2O_XSec_1Dcosmu_nu")) {
	return (new T2K_CC1pip_H2O_XSec_1Dcosmu_nu(samplekey));

	} else if (!name.compare("T2K_CC1pip_H2O_XSec_1Dcosmupi_nu")) {
	return (new T2K_CC1pip_H2O_XSec_1Dcosmupi_nu(samplekey));

	} else if (!name.compare("T2K_CC1pip_H2O_XSec_1Dcospi_nu")) {
	return (new T2K_CC1pip_H2O_XSec_1Dcospi_nu(samplekey));

	} else if (!name.compare("T2K_CC1pip_H2O_XSec_1Dpmu_nu")) {
	return (new T2K_CC1pip_H2O_XSec_1Dpmu_nu(samplekey));

	} else if (!name.compare("T2K_CC1pip_H2O_XSec_1Dppi_nu")) {
	return (new T2K_CC1pip_H2O_XSec_1Dppi_nu(samplekey));

	/*
	T2K CC0pi + np CH samples
	*/
	} else if (!name.compare("T2K_CC0pinp_STV_XSec_1Ddpt_nu")) {
	return (new T2K_CC0pinp_STV_XSec_1Ddpt_nu(samplekey));

	// SciBooNE COH studies
	} else
	#endif
	#ifndef __NO_SciBooNE__
	if (!name.compare("SciBooNE_CCCOH_STOP_NTrks_nu")) {
	return (new SciBooNE_CCCOH_STOP_NTrks_nu(samplekey));
	} else if (!name.compare("SciBooNE_CCCOH_1TRK_1DQ2_nu")) {
	return (new SciBooNE_CCCOH_1TRK_1DQ2_nu(samplekey));
	} else if (!name.compare("SciBooNE_CCCOH_MuPr_1DQ2_nu")) {
	return (new SciBooNE_CCCOH_MuPr_1DQ2_nu(samplekey));
	} else if (!name.compare("SciBooNE_CCCOH_MuPiVA_1DQ2_nu")) {
	return (new SciBooNE_CCCOH_MuPiVA_1DQ2_nu(samplekey));
	} else if (!name.compare("SciBooNE_CCCOH_MuPiNoVA_1DQ2_nu")) {
	return (new SciBooNE_CCCOH_MuPiNoVA_1DQ2_nu(samplekey));
	} else if (!name.compare("SciBooNE_CCCOH_MuPiNoVA_1Dthetapr_nu")) {
	return (new SciBooNE_CCCOH_MuPiNoVA_1Dthetapr_nu(samplekey));
	} else if (!name.compare("SciBooNE_CCCOH_MuPiNoVA_1Dthetapi_nu")) {
	return (new SciBooNE_CCCOH_MuPiNoVA_1Dthetapi_nu(samplekey));
	} else if (!name.compare("SciBooNE_CCCOH_STOPFINAL_1DQ2_nu")) {
	return (new SciBooNE_CCCOH_STOPFINAL_1DQ2_nu(samplekey));

	/*
	K2K Samples
	*/
	/*
	NC1pi0
	*/
	} else
	#endif
	#ifndef __NO_K2K__
	if (!name.compare("K2K_NC1pi0_Evt_1Dppi0_nu")) {
	return (new K2K_NC1pi0_Evt_1Dppi0_nu(samplekey));

	/*
	Fake Studies
	*/

	} else
	#endif
	if (name.find("ExpMultDist_CCQE_XSec_1D") != std::string::npos &&
	name.find("_FakeStudy") != std::string::npos) {
	return (
	new ExpMultDist_CCQE_XSec_1DVar_FakeStudy(name, file, rw, type, fkdt));

	} else if (name.find("ExpMultDist_CCQE_XSec_2D") != std::string::npos &&
	name.find("_FakeStudy") != std::string::npos) {
	return (
	new ExpMultDist_CCQE_XSec_2DVar_FakeStudy(name, file, rw, type, fkdt));

	} else if (name.find("GenericFlux_") != std::string::npos) {
	return (new GenericFlux_Tester(name, file, rw, type, fkdt));

	} else if (name.find("GenericVectors_") != std::string::npos) {
	return (new GenericFlux_Vectors(name, file, rw, type, fkdt));

	} else if (!name.compare("T2K2017_FakeData")) {
	return (new T2K2017_FakeData(samplekey));

	} else if (!name.compare("MCStudy_CCQE")) {
	return (new MCStudy_CCQEHistograms(name, file, rw, type, fkdt));

	} else if (!name.compare("ElectronFlux_FlatTree")) {
	return (new ElectronFlux_FlatTree(name, file, rw, type, fkdt));

	} else if (name.find("ElectronData_") != std::string::npos) {
	return new ElectronScattering_DurhamData(samplekey);

	} else if (name.find("MuonValidation_") != std::string::npos) {
	return (new MCStudy_MuonValidation(name, file, rw, type, fkdt));

	} else if (!name.compare("NIWGOfficialPlots")) {
	return (new OfficialNIWGPlots(samplekey));

	} else if (!name.compare("Simple_Osc")) {
	return (new Simple_Osc(samplekey));

	} else if (!name.compare("Smear_SVDUnfold_Propagation_Osc")) {
	return (new Smear_SVDUnfold_Propagation_Osc(samplekey));

	} else {
	ERR(FTL) << "Error: No such sample: " << name << std::endl;
	exit(-1);
	return NULL;
	}

	// Return NULL if no sample loaded.
	return NULL;
	}
	}
	diff --git a/src/T2K/CMakeLists.txt b/src/T2K/CMakeLists.txt
	index 50ba522..b12f32d 100644
	--- a/src/T2K/CMakeLists.txt
	+++ b/src/T2K/CMakeLists.txt
	@@ -1,84 +1,85 @@
	# Copyright 2016 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret

	################################################################################
	# This file is part of NUISANCE.
	#
	# NUISANCE is free software: you can redistribute it and/or modify
	# it under the terms of the GNU General Public License as published by
	# the Free Software Foundation, either version 3 of the License, or
	# (at your option) any later version.
	#
	# NUISANCE is distributed in the hope that it will be useful,
	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	# GNU General Public License for more details.
	#
	# You should have received a copy of the GNU General Public License
	# along with NUISANCE. If not, see <http://www.gnu.org/licenses/>.
	################################################################################
	set(IMPLFILES
	T2K_CC0pi_XSec_2DPcos_nu.cxx
	+T2K_CCinc_XSec_2DPcos_nu.cxx
	T2K_CC1pip_CH_XSec_1DQ2_nu.cxx
	T2K_CC1pip_CH_XSec_1DWrec_nu.cxx
	T2K_CC1pip_CH_XSec_1Dpmu_nu.cxx
	T2K_CC1pip_CH_XSec_1Dppi_nu.cxx
	T2K_CC1pip_CH_XSec_1Dq3_nu.cxx
	T2K_CC1pip_CH_XSec_1Dthmupi_nu.cxx
	T2K_CC1pip_CH_XSec_1Dthpi_nu.cxx
	T2K_CC1pip_CH_XSec_1Dthq3pi_nu.cxx
	T2K_CC1pip_H2O_XSec_1DEnuDelta_nu.cxx
	T2K_CC1pip_H2O_XSec_1DEnuMB_nu.cxx
	T2K_CC1pip_H2O_XSec_1Dcosmu_nu.cxx
	T2K_CC1pip_H2O_XSec_1Dcosmupi_nu.cxx
	T2K_CC1pip_H2O_XSec_1Dcospi_nu.cxx
	T2K_CC1pip_H2O_XSec_1Dpmu_nu.cxx
	T2K_CC1pip_H2O_XSec_1Dppi_nu.cxx
	T2K_CC0pinp_STV_XSec_1Ddpt_nu.cxx
	T2K_CC0pi_XSec_2DPcos_nu_nonuniform.cxx
	T2K_SignalDef.cxx
	)

	set(HEADERFILES
	T2K_CC0pi_XSec_2DPcos_nu.h
	T2K_CC1pip_CH_XSec_1DQ2_nu.h
	T2K_CC1pip_CH_XSec_1DWrec_nu.h
	T2K_CC1pip_CH_XSec_1Dpmu_nu.h
	T2K_CC1pip_CH_XSec_1Dppi_nu.h
	T2K_CC1pip_CH_XSec_1Dq3_nu.h
	T2K_CC1pip_CH_XSec_1Dthmupi_nu.h
	T2K_CC1pip_CH_XSec_1Dthpi_nu.h
	T2K_CC1pip_CH_XSec_1Dthq3pi_nu.h
	T2K_CC1pip_H2O_XSec_1DEnuDelta_nu.h
	T2K_CC1pip_H2O_XSec_1DEnuMB_nu.h
	T2K_CC1pip_H2O_XSec_1Dcosmu_nu.h
	T2K_CC1pip_H2O_XSec_1Dcosmupi_nu.h
	T2K_CC1pip_H2O_XSec_1Dcospi_nu.h
	T2K_CC1pip_H2O_XSec_1Dpmu_nu.h
	T2K_CC1pip_H2O_XSec_1Dppi_nu.h
	T2K_CC0pinp_STV_XSec_1Ddpt_nu.h
	T2K_CC0pi_XSec_2DPcos_nu_nonuniform.h
	T2K_SignalDef.h
	)

	set(LIBNAME expT2K)

	if(CMAKE_BUILD_TYPE MATCHES DEBUG)
	add_library(${LIBNAME} STATIC ${IMPLFILES})
	else(CMAKE_BUILD_TYPE MATCHES RELEASE)
	add_library(${LIBNAME} SHARED ${IMPLFILES})
	endif()

	include_directories(${MINIMUM_INCLUDE_DIRECTORIES})

	set_target_properties(${LIBNAME} PROPERTIES VERSION
	"${NUISANCE_VERSION_MAJOR}.${NUISANCE_VERSION_MINOR}.${NUISANCE_VERSION_REVISION}")
	#set_target_properties(${LIBNAME} PROPERTIES LINK_FLAGS ${ROOT_LD_FLAGS})
	if(DEFINED PROJECTWIDE_EXTRA_DEPENDENCIES)
	add_dependencies(${LIBNAME} ${PROJECTWIDE_EXTRA_DEPENDENCIES})
	endif()

	install(TARGETS ${LIBNAME} DESTINATION lib)
	#Can uncomment this to install the headers... but is it really neccessary?
	#install(FILES ${HEADERFILES} DESTINATION include)

	set(MODULETargets ${MODULETargets} ${LIBNAME} PARENT_SCOPE)
	diff --git a/src/T2K/MeasurementVariableBox1D.cxx b/src/T2K/MeasurementVariableBox1D.cxx
	new file mode 100644
	index 0000000..37a6bee
	--- /dev/null
	+++ b/src/T2K/MeasurementVariableBox1D.cxx
	@@ -0,0 +1,45 @@
	+#include "MeasurementVariableBox1D.h"
	+
	+void MeasurementVariableBox1D::Reset() {
	+ fX = -999.9;
	+ fY = -999.9;
	+}
	+
	+void MeasurementVariableBox1D::FillBoxFromEvent(FitEvent* evt) {
	+ return;
	+}
	+
	+MeasurementVariableBox* MeasurementVariableBox1D::CloneSignalBox() {
	+ MeasurementVariableBox1D* box = new MeasurementVariableBox1D();
	+ box->fX = this->fX;
	+ box->fY = this->fY;
	+ return box;
	+};
	+
	+void MeasurementVariableBox1D::Print() {
	+ std::cout << "Printing Empty BOX! " << std::endl;
	+}
	+
	+double MeasurementVariableBox1D::GetX(){
	+ return fX;
	+}
	+
	+double MeasurementVariableBox1D::GetY(){
	+ return fY;
	+}
	+
	+double MeasurementVariableBox1D::GetZ(){
	+ return -999.9;
	+}
	+
	+int MeasurementVariableBox1D::GetMode(){
	+ return 0;
	+}
	+
	+void MeasurementVariableBox1D::SetX(double x){
	+ fX = x;
	+}
	+
	+void MeasurementVariableBox1D::SetY(double y){
	+ fY = y;
	+}
	diff --git a/src/T2K/MeasurementVariableBox1D.h b/src/T2K/MeasurementVariableBox1D.h
	new file mode 100644
	index 0000000..9d7ab42
	--- /dev/null
	+++ b/src/T2K/MeasurementVariableBox1D.h
	@@ -0,0 +1,31 @@
	+#ifndef MEASUREMENTVARIABLEBOX1D_H
	+#define MEASUREMENTVARIABLEBOX1D_H
	+#include "FitEvent.h"
	+#include "MeasurementVariableBox.h"
	+
	+class MeasurementVariableBox1D : public MeasurementVariableBox {
	+public:
	+ MeasurementVariableBox1D() {};
	+ ~MeasurementVariableBox1D() {};
	+
	+ virtual void Reset();
	+ virtual void FillBoxFromEvent(FitEvent* evt);
	+ virtual MeasurementVariableBox* CloneSignalBox();
	+ virtual void Print();
	+
	+ virtual double GetX();
	+ virtual double GetY();
	+ virtual double GetZ();
	+ virtual int GetMode();
	+
	+ virtual void SetX(double x);
	+ virtual void SetY(double y);
	+ virtual void SetZ(double z){};
	+ virtual void SetMode(int m){};
	+
	+ double fX;
	+ double fY;
	+
	+};
	+
	+#endif
	diff --git a/src/T2K/T2K_CCinc_XSec_2DPcos_nu_nonuniform.cxx b/src/T2K/T2K_CCinc_XSec_2DPcos_nu_nonuniform.cxx
	new file mode 100644
	index 0000000..0e80bb9
	--- /dev/null
	+++ b/src/T2K/T2K_CCinc_XSec_2DPcos_nu_nonuniform.cxx
	@@ -0,0 +1,163 @@
	+#include "T2K_SignalDef.h"
	+
	+#include "T2K_CCinc_XSec_2DPcos_nu_nonuniform.h"
	+
	+//********************************************************************
	+T2K_CCinc_XSec_2DPcos_nu_nonuniform::T2K_CCinc_XSec_2DPcos_nu_nonuniform(nuiskey samplekey) {
	+//********************************************************************
	+
	+ // Sample overview ---------------------------------------------------
	+ std::string descrip = "T2K_CCinc_XSec_2DPcos_nu_nonuniform sample. \n" \
	+ "Target: CH \n" \
	+ "Flux: T2K FHC numu \n" \
	+ "Signal: CC-inclusive \n";
	+
	+ // Setup common settings
	+ fSettings = LoadSampleSettings(samplekey);
	+ fSettings.SetDescription(descrip);
	+ fSettings.SetXTitle("p_{#mu} (GeV)");
	+ fSettings.SetYTitle("cos#theta_{#mu}");
	+ fSettings.SetZTitle("#frac{d^{2}#sigma}{dp_{#mu}dcos#theta_{#mu}} [#frac{cm^{2}}{nucleon/GeV/c}]");
	+ fSettings.SetEnuRange(0.0, 30.0);
	+ fSettings.DefineAllowedTargets("C,H");
	+
	+ // CCQELike plot information
	+ fSettings.SetTitle("T2K_CCinc_XSec_2DPcos_nu_nonuniform");
	+ fSettings.DefineAllowedSpecies("numu");
	+
	+ FinaliseSampleSettings();
	+
	+ // Scaling Setup ---------------------------------------------------
	+ // ScaleFactor automatically setup for DiffXSec/cm2/Nucleon
	+ fScaleFactor = GetEventHistogram()->Integral("width")*1E-38/fNEvents/TotalIntegratedFlux();
	+
	+ // Setup Histograms
	+ SetHistograms();
	+
	+ // Final setup ---------------------------------------------------
	+ FinaliseMeasurement();
	+
	+};
	+
	+
	+bool T2K_CCinc_XSec_2DPcos_nu_nonuniform::isSignal(FitEvent *event){
	+ return SignalDef::isCCINC(event, 14, EnuMin, EnuMax);
	+};
	+
	+void T2K_CCinc_XSec_2DPcos_nu_nonuniform::FillEventVariables(FitEvent* event){
	+
	+ if (event->NumFSParticle(13) == 0) return;
	+
	+ TLorentzVector Pnu = event->GetNeutrinoIn()->fP;
	+ TLorentzVector Pmu = event->GetHMFSParticle(13)->fP;
	+
	+ double pmu = Pmu.Vect().Mag()/1000.;
	+ double CosThetaMu = cos(Pnu.Vect().Angle(Pmu.Vect()));
	+
	+ fXVar = pmu;
	+ fYVar = CosThetaMu;
	+
	+};
	+
	+void T2K_CCinc_XSec_2DPcos_nu_nonuniform::FillHistograms(){
	+
	+ if (Signal) FillMCSlice( fXVar, fYVar, Weight );
	+
	+}
	+
	+
	+// Modification is needed after the full reconfigure to move bins around
	+void T2K_CCinc_XSec_2DPcos_nu_nonuniform::ConvertEventRates(){
	+
	+ // Do standard conversion.
	+ Measurement1D::ConvertEventRates();
	+
	+ // First scale MC slices also by their width in Y
	+ fMCHist_Slices[0]->Scale(1.0 / 0.25);
	+ fMCHist_Slices[1]->Scale(1.0 / 0.50);
	+ fMCHist_Slices[2]->Scale(1.0 / 0.20);
	+ fMCHist_Slices[3]->Scale(1.0 / 0.15);
	+ fMCHist_Slices[4]->Scale(1.0 / 0.11);
	+ fMCHist_Slices[5]->Scale(1.0 / 0.09);
	+ fMCHist_Slices[6]->Scale(1.0 / 0.07);
	+ fMCHist_Slices[7]->Scale(1.0 / 0.05);
	+ fMCHist_Slices[8]->Scale(1.0 / 0.04);
	+ fMCHist_Slices[9]->Scale(1.0 / 0.025);
	+ fMCHist_Slices[10]->Scale(1.0 / 0.015);
	+
	+ // Now Convert into 1D list
	+ fMCHist->Reset();
	+ int bincount = 0;
	+ for (int i = 0; i < 11; i++){
	+ for (int j = 0; j < fDataHist_Slices[i]->GetNbinsX(); j++){
	+ fMCHist->SetBinContent(bincount+1, fMCHist_Slices[i]->GetBinContent(j+1));
	+ bincount++;
	+ }
	+ }
	+
	+}
	+
	+void T2K_CCinc_XSec_2DPcos_nu_nonuniform::FillMCSlice(double x, double y, double w){
	+
	+ if (y >= -1.0 and y < -0.25) fMCHist_Slices[0]->Fill(x,w);
	+ else if (y >= -0.25 and y < 0.25) fMCHist_Slices[1]->Fill(x,w);
	+ else if (y >= 0.25 and y < 0.45) fMCHist_Slices[2]->Fill(x,w);
	+ else if (y >= 0.45 and y < 0.6) fMCHist_Slices[3]->Fill(x,w);
	+ else if (y >= 0.6 and y < 0.71) fMCHist_Slices[4]->Fill(x,w);
	+ else if (y >= 0.71 and y < 0.80) fMCHist_Slices[5]->Fill(x,w);
	+ else if (y >= 0.80 and y < 0.87) fMCHist_Slices[6]->Fill(x,w);
	+ else if (y >= 0.87 and y < 0.92) fMCHist_Slices[7]->Fill(x,w);
	+ else if (y >= 0.92 and y < 0.96) fMCHist_Slices[8]->Fill(x,w);
	+ else if (y >= 0.96 and y <= 0.985) fMCHist_Slices[9]->Fill(x,w);
	+ else if (y >= 0.985 and y <= 1.0) fMCHist_Slices[10]->Fill(x,w);
	+
	+}
	+
	+
	+void T2K_CCinc_XSec_2DPcos_nu_nonuniform::SetHistograms(){
	+
	+ // Read in 1D Data Histograms
	+ fInputFile = new TFile( (FitPar::GetDataBase() + "/T2K/CCinc/CH-2017/T2K_CCINC_2DPmuCosmu_Data_FitGENIE.root").c_str(),"READ");
	+
	+ // Read in 1D Data
	+ fDataHist = (TH1D*) fInputFile->Get("datahist");
	+
	+ TH2D* tempcorr = (TH2D*) fInputFile->Get("totcorr");
	+
	+ fFullCovar = new TMatrixDSym(fDataHist->GetNbinsX());
	+ for (int i = 0; i < fDataHist->GetNbinsX(); i++){
	+ for (int j = 0; j < fDataHist->GetNbinsX(); j++){
	+ (fFullCovar)(i,j) = tempcorr->GetBinContent(i+1,j+1) fDataHist->GetBinError(i+1)1e38 fDataHist->GetBinError(j+1)*1e38;
	+ }
	+ }
	+ covar = StatUtils::GetInvert(fFullCovar);
	+ fDecomp = StatUtils::GetDecomp(fFullCovar);
	+
	+ // Read in 2D Data Slices and Make MC Slices
	+ int bincount = 0;
	+ for (int i = 0; i < 11; i++){
	+
	+ // Get Data Histogram
	+ fDataHist_Slices.push_back((TH1D*)fInputFile->Get(Form("dataslice_%i",i))->Clone());
	+ fDataHist_Slices[i]->SetNameTitle(Form("T2K_CCinc_XSec_2DPcos_nu_nonuniform_data_Slice%i",i), (Form("T2K_CCinc_XSec_2DPcos_nu_nonuniform_data_Slice%i",i)));
	+
	+ // Loop over nbins and set errors from covar
	+ for (int j = 0; j < fDataHist_Slices[i]->GetNbinsX(); j++){
	+
	+ std::cout << "Setting data hist " << fDataHist_Slices[i]->GetBinContent(j+1) << " " << fDataHist_Slices[i]->GetBinError(j+1) << std::endl;
	+ fDataHist->SetBinContent(bincount+1, fDataHist_Slices[i]->GetBinContent(j+1) );
	+ fDataHist->SetBinError(bincount+1, fDataHist_Slices[i]->GetBinError(j+1) );
	+
	+ bincount++;
	+ }
	+
	+ // Make MC Clones
	+ fMCHist_Slices.push_back((TH1D*) fDataHist_Slices[i]->Clone());
	+ fMCHist_Slices[i]->SetNameTitle(Form("T2K_CCinc_XSec_2DPcos_nu_nonuniform_MC_Slice%i",i), (Form("T2K_CCinc_XSec_2DPcos_nu_nonuniform_MC_Slice%i",i)));
	+
	+ SetAutoProcessTH1(fDataHist_Slices[i],kCMD_Write);
	+ SetAutoProcessTH1(fMCHist_Slices[i]);
	+
	+ }
	+
	+};
	diff --git a/src/T2K/T2K_CCinc_XSec_2DPcos_nu_nonuniform.h b/src/T2K/T2K_CCinc_XSec_2DPcos_nu_nonuniform.h
	new file mode 100644
	index 0000000..53506e0
	--- /dev/null
	+++ b/src/T2K/T2K_CCinc_XSec_2DPcos_nu_nonuniform.h
	@@ -0,0 +1,42 @@
	+#ifndef T2K_CCINC_2DPCOS_NU_NONUNIFORM_H_SEEN
	+#define T2K_CCINC_2DPCOS_NU_NONUNIFORM_H_SEEN
	+
	+#include "Measurement1D.h"
	+
	+class T2K_CCinc_XSec_2DPcos_nu_nonuniform : public Measurement1D {
	+public:
	+
	+ /// Basic Constructor.
	+ T2K_CCinc_XSec_2DPcos_nu_nonuniform(nuiskey samplekey);
	+
	+ /// Virtual Destructor
	+ ~T2K_CCinc_XSec_2DPcos_nu_nonuniform() {};
	+
	+ /// Numu CC0PI Signal Definition
	+ bool isSignal(FitEvent *nvect);
	+
	+ void SetHistograms();
	+
	+ /// Bin Tmu CosThetaMu
	+ void FillEventVariables(FitEvent* customEvent);
	+
	+ // Fill Histograms
	+ void FillHistograms();
	+
	+ /// Have to do a weird event scaling for analysis 1
	+ void ConvertEventRates();
	+
	+ private:
	+
	+ double pmu, CosThetaMu;
	+
	+ TFile* fInputFile;
	+
	+ std::vector<TH1D*> fMCHist_Slices;
	+ std::vector<TH1D*> fDataHist_Slices;
	+
	+ void FillMCSlice(double x, double y, double w);
	+
	+};
	+
	+#endif

File Metadata

Mime Type: text/x-diff
Expires: Sun, Feb 23, 2:00 PM (1 h, 54 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 4478582
Default Alt Text: (61 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions