No OneTemporary
Actions

Size

56 KB

Subscribers

None

View Options

	diff --git a/app/PrepareNEUT.cxx b/app/PrepareNEUT.cxx
	index 8a0c67e..d177a46 100644
	--- a/app/PrepareNEUT.cxx
	+++ b/app/PrepareNEUT.cxx
	@@ -1,422 +1,424 @@
	-#include <stdio.h>
	-#include <stdlib.h>
	#include "FitLogger.h"
	#include "PlotUtils.h"
	#include "StatUtils.h"
	#include "TFile.h"
	#include "TH1D.h"
	#include "TTree.h"
	+#include <stdio.h>
	+#include <stdlib.h>

	// If you don't have NEUT enabled, you shouldn't compile this...
	#include "neutpart.h"
	#include "neutvect.h"

	std::string fInputFiles = "";
	std::string fOutputFile = "";
	std::string fFluxFile = "";
	bool fFluxInGeV = false;
	bool fIsMonoEFlux = false;
	double fMonoEEnergy = 0xdeadbeef;

	void PrintOptions();
	-void ParseOptions(int argc, char* argv[]);
	+void ParseOptions(int argc, char *argv[]);
	void AddMonoRateHistogram(std::string inputList, double MonoE,
	std::string output);
	void CreateRateHistogram(std::string inputList, std::string flux,
	std::string output);

	//*******************************
	-int main(int argc, char* argv[]) {
	+int main(int argc, char *argv[]) {
	//*******************************

	LOG_VERB(FitPar::Config().GetParI("VERBOSITY"));
	ERR_VERB(FitPar::Config().GetParI("ERROR"));

	ParseOptions(argc, argv);
	LOG(FIT) << "Running PrepareNEUT" << std::endl;
	if (fIsMonoEFlux) {
	AddMonoRateHistogram(fInputFiles, fMonoEEnergy, fOutputFile);
	} else {
	CreateRateHistogram(fInputFiles, fFluxFile, fOutputFile);
	}
	};

	void AddMonoRateHistogram(std::string inputList, double MonoE,
	std::string output) {
	// Need to allow for more than one file... will do soon
	- TChain* tn = new TChain("neuttree");
	+ TChain *tn = new TChain("neuttree");

	std::vector<std::string> inputs = GeneralUtils::ParseToStr(inputList, ",");
	for (std::vector<std::string>::iterator it = inputs.begin();
	it != inputs.end(); ++it) {
	LOG(FIT) << "Adding " << *it << " to the output" << std::endl;
	tn->AddFile((*it).c_str());
	}

	if (inputs.size() > 1 && output.empty()) {
	ERR(FTL) << "You must provide a new output file name if you want to have "
	"more than 1 input file!"
	<< std::endl;
	throw;
	}

	int nevts = tn->GetEntries();

	if (!nevts) {
	ERR(FTL) << "Either the input file is not from NEUT, or it's empty..."
	<< std::endl;
	throw;
	}

	- NeutVect* fNeutVect = NULL;
	+ NeutVect *fNeutVect = NULL;
	tn->SetBranchAddress("vectorbranch", &fNeutVect);

	- TH1D* fluxHist = new TH1D("flux", "flux", 1000, 0, fFluxInGeV ? 10 : 10000);
	+ TH1D *fluxHist = new TH1D("flux", "flux", 1000, 0, fFluxInGeV ? 10 : 10000);
	fluxHist->Fill(MonoE);
	fluxHist->Scale(1, "width");
	// Make Event Hist
	- TH1D* xsecHist = (TH1D*)fluxHist->Clone();
	+ TH1D xsecHist = (TH1D )fluxHist->Clone();
	xsecHist->Reset();

	// Make a total cross section hist for shits and giggles
	- TH1D* entryHist = (TH1D*)xsecHist->Clone();
	+ TH1D entryHist = (TH1D )xsecHist->Clone();

	double MeanE = 0;
	for (int i = 0; i < nevts; ++i) {
	tn->GetEntry(i);
	- NeutPart* part = fNeutVect->PartInfo(0);
	+ NeutPart *part = fNeutVect->PartInfo(0);
	double E = part->fP.E();
	double xsec = fNeutVect->Totcrs;

	// Unit conversion
	- if (fFluxInGeV) E *= 1E-3;
	+ if (fFluxInGeV)
	+ E *= 1E-3;

	xsecHist->Fill(E, xsec);
	entryHist->Fill(E);
	MeanE += E;

	if (i % (nevts / 20) == 0) {
	LOG(FIT) << "Processed " << i << "/" << nevts << " NEUT events."
	<< std::endl;
	}
	}
	MeanE /= double(nevts);
	LOG(FIT) << "Processed all events" << std::endl;

	xsecHist->Divide(entryHist);

	// This will be the evtrt histogram
	- TH1D* evtHist = (TH1D*)xsecHist->Clone();
	+ TH1D evtHist = (TH1D )xsecHist->Clone();
	evtHist->Multiply(fluxHist);

	// Check whether the overflow is empty. If not, advise that either the wrong
	// flux histogram or units were used...
	// If the events were generated with a limited range of the flux histogram,
	// this may be benign
	if (evtHist->Integral(0, -1) != evtHist->Integral() \|\|
	evtHist->Integral(0, -1) == 0) {
	- ERR(WRN) << "The input file and flux histogram provided do not match... "
	- << std::endl;
	+ ERR(WRN) << "The input file(" << evtHist->Integral(0, -1)
	+ << ") and flux histogram provided do not match... " << std::endl;
	ERR(WRN) << "Are the units correct (MeanE = " << MeanE
	<< ", FluxHistoUpperLim: "
	<< fluxHist->GetXaxis()->GetBinUpEdge(1000)
	<< ")? Did you provide the correct flux file?" << std::endl;
	ERR(WRN) << "Use output with caution..." << std::endl;
	}

	// Pick where the output should go
	- TFile* outFile = NULL;
	+ TFile *outFile = NULL;
	if (!output.empty()) {
	LOG(FIT) << "Saving histograms in " << output << std::endl;
	outFile = new TFile(output.c_str(), "RECREATE");
	} else {
	LOG(FIT) << "Saving histograms in " << inputs[0] << std::endl;
	outFile = new TFile(inputs[0].c_str(), "UPDATE");
	}
	outFile->cd();

	std::string xsec_name = "xsec_PrepareNeut";
	std::string flux_name = "flux_PrepareNeut";
	std::string rate_name = "evtrt_PrepareNeut";

	if (output.empty()) {
	// Check whether we should overwrite existing histograms
	std::string input_xsec = PlotUtils::GetObjectWithName(outFile, "xsec");
	std::string input_flux = PlotUtils::GetObjectWithName(outFile, "flux");
	std::string input_rate = PlotUtils::GetObjectWithName(outFile, "evtrt");

	if (!input_xsec.empty()) {
	LOG(FIT) << "Updating histogram: " << input_xsec << std::endl;
	xsec_name = input_xsec;
	}
	if (!input_flux.empty()) {
	LOG(FIT) << "Updating histogram: " << input_flux << std::endl;
	flux_name = input_flux;
	}
	if (!input_rate.empty()) {
	LOG(FIT) << "Updating histogram: " << input_rate << std::endl;
	rate_name = input_rate;
	}

	} else {
	LOG(FIT) << "Cloning neuttree into output file." << std::endl;
	StopTalking();
	- TTree* newtree = (TTree*)tn->CloneTree(-1, "fast");
	+ TTree newtree = (TTree )tn->CloneTree(-1, "fast");
	StartTalking();
	newtree->Write();
	}

	xsecHist->Write(xsec_name.c_str(), TObject::kOverwrite);
	fluxHist->Write(flux_name.c_str(), TObject::kOverwrite);
	evtHist->Write(rate_name.c_str(), TObject::kOverwrite);

	outFile->Close();
	}

	//*******************************
	void CreateRateHistogram(std::string inputList, std::string flux,
	std::string output) {
	//*******************************

	// Need to allow for more than one file... will do soon
	- TChain* tn = new TChain("neuttree");
	+ TChain *tn = new TChain("neuttree");

	std::vector<std::string> inputs = GeneralUtils::ParseToStr(inputList, ",");
	for (std::vector<std::string>::iterator it = inputs.begin();
	it != inputs.end(); ++it) {
	LOG(FIT) << "Adding " << *it << " to the output" << std::endl;
	tn->AddFile((*it).c_str());
	}

	if (inputs.size() > 1 && output.empty()) {
	ERR(FTL) << "You must provide a new output file name if you want to have "
	"more than 1 input file!"
	<< std::endl;
	throw;
	}

	int nevts = tn->GetEntries();

	if (!nevts) {
	ERR(FTL) << "Either the input file is not from NEUT, or it's empty..."
	<< std::endl;
	throw;
	}

	- NeutVect* fNeutVect = NULL;
	+ NeutVect *fNeutVect = NULL;
	tn->SetBranchAddress("vectorbranch", &fNeutVect);

	// Get Flux Hist
	std::vector<std::string> fluxvect = GeneralUtils::ParseToStr(flux, ",");
	- TH1D* fluxHist = NULL;
	+ TH1D *fluxHist = NULL;
	if (fluxvect.size() > 1) {
	- TFile* fluxfile = new TFile(fluxvect[0].c_str(), "READ");
	- fluxHist = (TH1D*)fluxfile->Get(fluxvect[1].c_str());
	+ TFile *fluxfile = new TFile(fluxvect[0].c_str(), "READ");
	+ fluxHist = (TH1D *)fluxfile->Get(fluxvect[1].c_str());
	fluxHist->SetDirectory(0);
	} else {
	ERR(FTL) << "NO FLUX SPECIFIED" << std::endl;
	throw;
	}

	// Decide what type of flux was given
	if (fFluxInGeV)
	LOG(FIT) << "Assuming flux histogram is in GeV" << std::endl;
	else
	LOG(FIT) << "Assuming flux histogram is in MeV" << std::endl;

	// Make Event Hist
	- TH1D* xsecHist = (TH1D*)fluxHist->Clone();
	+ TH1D xsecHist = (TH1D )fluxHist->Clone();
	xsecHist->Reset();

	// Make a total cross section hist for shits and giggles
	- TH1D* entryHist = (TH1D*)xsecHist->Clone();
	+ TH1D entryHist = (TH1D )xsecHist->Clone();

	for (int i = 0; i < nevts; ++i) {
	tn->GetEntry(i);
	- NeutPart* part = fNeutVect->PartInfo(0);
	+ NeutPart *part = fNeutVect->PartInfo(0);
	double E = part->fP.E();
	double xsec = fNeutVect->Totcrs;

	// Unit conversion
	- if (fFluxInGeV) E *= 1E-3;
	+ if (fFluxInGeV)
	+ E *= 1E-3;

	xsecHist->Fill(E, xsec);
	entryHist->Fill(E);

	if (i % (nevts / 20) == 0) {
	LOG(FIT) << "Processed " << i << "/" << nevts << " NEUT events."
	- << std::endl;
	+ << "(Enu = " << E << ", xsec = " << xsec << ") " << std::endl;
	}
	}
	LOG(FIT) << "Processed all events" << std::endl;

	xsecHist->Divide(entryHist);

	// This will be the evtrt histogram
	- TH1D* evtHist = NULL;
	+ TH1D *evtHist = NULL;

	// If the integral of xsecHist is 0 the input file used a really old version
	// of NEUT without Totcrs
	if (!xsecHist->Integral(0, -1)) {
	ERR(WRN) << "Old NEUT input file: events will not be correctly normalized"
	<< std::endl;
	- evtHist = (TH1D*)entryHist->Clone();
	+ evtHist = (TH1D *)entryHist->Clone();

	if (evtHist->Integral() != 0)
	evtHist->Scale(fluxHist->Integral() / float(evtHist->Integral()));
	} else {
	- evtHist = (TH1D*)xsecHist->Clone();
	+ evtHist = (TH1D *)xsecHist->Clone();
	evtHist->Multiply(fluxHist);
	}

	// Check whether the overflow is empty. If not, advise that either the wrong
	// flux histogram or units were used...
	// If the events were generated with a limited range of the flux histogram,
	// this may be benign
	if (evtHist->Integral(0, -1) != evtHist->Integral() \|\|
	evtHist->Integral(0, -1) == 0) {
	- ERR(WRN) << "The input file and flux histogram provided do not match... "
	- << std::endl;
	+ ERR(WRN) << "The input file(" << evtHist->Integral(0, -1)
	+ << ") and flux histogram provided do not match... " << std::endl;
	ERR(WRN) << "Are the units correct? Did you provide the correct flux file?"
	<< std::endl;
	ERR(WRN) << "Use output with caution..." << std::endl;
	}

	// Pick where the output should go
	- TFile* outFile = NULL;
	+ TFile *outFile = NULL;
	if (!output.empty()) {
	LOG(FIT) << "Saving histograms in " << output << std::endl;
	outFile = new TFile(output.c_str(), "RECREATE");
	} else {
	LOG(FIT) << "Saving histograms in " << inputs[0] << std::endl;
	outFile = new TFile(inputs[0].c_str(), "UPDATE");
	}
	outFile->cd();

	std::string xsec_name = "xsec_PrepareNeut";
	std::string flux_name = "flux_PrepareNeut";
	std::string rate_name = "evtrt_PrepareNeut";

	if (output.empty()) {
	// Check whether we should overwrite existing histograms
	std::string input_xsec = PlotUtils::GetObjectWithName(outFile, "xsec");
	std::string input_flux = PlotUtils::GetObjectWithName(outFile, "flux");
	std::string input_rate = PlotUtils::GetObjectWithName(outFile, "evtrt");

	if (!input_xsec.empty()) {
	LOG(FIT) << "Updating histogram: " << input_xsec << std::endl;
	xsec_name = input_xsec;
	}
	if (!input_flux.empty()) {
	LOG(FIT) << "Updating histogram: " << input_flux << std::endl;
	flux_name = input_flux;
	}
	if (!input_rate.empty()) {
	LOG(FIT) << "Updating histogram: " << input_rate << std::endl;
	rate_name = input_rate;
	}

	} else {
	LOG(FIT) << "Cloning neuttree into output file." << std::endl;
	StopTalking();
	- TTree* newtree = (TTree*)tn->CloneTree(-1, "fast");
	+ TTree newtree = (TTree )tn->CloneTree(-1, "fast");
	StartTalking();
	newtree->Write();
	}

	xsecHist->Write(xsec_name.c_str(), TObject::kOverwrite);
	fluxHist->Write(flux_name.c_str(), TObject::kOverwrite);
	evtHist->Write(rate_name.c_str(), TObject::kOverwrite);
	outFile->Close();

	return;
	}

	void PrintOptions() {
	std::cout << "PrepareNEUT NUISANCE app. " << std::endl
	<< "Produces or recalculates evtrt and flux histograms necessary "
	"for NUISANCE normalization."
	<< std::endl;
	std::cout << "PrepareNEUT: " << std::endl;
	std::cout << " [-h,-help,--h,--help]" << std::endl;
	std::cout << " -i inputfile1.root,inputfile2.root,inputfile3.root,..."
	<< std::endl;
	std::cout << " Takes any number of files, but assumes all are "
	"produced with a single flux"
	<< std::endl;
	std::cout << " -f flux_root_file.root,flux_hist_name" << std::endl;
	std::cout << " Path to root file containing the flux histogram used "
	"when generating the NEUT files"
	<< std::endl;
	std::cout << " [-o outputfile.root] " << std::endl;
	std::cout
	<< " If an output file is not given, the input file will be used"
	<< std::endl;
	std::cout << " If more than one input file is given, an output file "
	"must be given"
	<< std::endl;
	std::cout << " [-G]" << std::endl;
	std::cout << " Flux is assumed to be in MeV. This switch indicates "
	"the input flux is in GeV"
	<< std::endl;
	std::cout << " [-m E_nu]" << std::endl;
	std::cout << " Used to add dummy flux and evt rate histograms to "
	"mono-energetic vectors. Adheres to the -G flag."
	<< std::endl;
	}

	-void ParseOptions(int argc, char* argv[]) {
	+void ParseOptions(int argc, char *argv[]) {
	bool flagopt = false;

	// If No Arguments print commands
	for (int i = 1; i < argc; ++i) {
	if (!std::strcmp(argv[i], "-h")) {
	flagopt = true;
	break;
	} else if (!std::strcmp(argv[i], "-G")) {
	fFluxInGeV = true;
	continue;
	}
	if (i + 1 != argc) {
	// Cardfile
	if (!std::strcmp(argv[i], "-h")) {
	flagopt = true;
	break;
	} else if (!std::strcmp(argv[i], "-i")) {
	fInputFiles = argv[i + 1];
	++i;
	} else if (!std::strcmp(argv[i], "-o")) {
	fOutputFile = argv[i + 1];
	++i;
	} else if (!std::strcmp(argv[i], "-f")) {
	fFluxFile = argv[i + 1];
	++i;
	} else if (!std::strcmp(argv[i], "-m")) {
	fIsMonoEFlux = true;
	fMonoEEnergy = GeneralUtils::StrToDbl(argv[i + 1]);
	++i;
	} else {
	ERR(FTL) << "ERROR: unknown command line option given! - '" << argv[i]
	<< " " << argv[i + 1] << "'" << std::endl;
	PrintOptions();
	break;
	}
	}
	}
	if (fInputFiles == "" && !flagopt) {
	ERR(FTL) << "No input file(s) specified!" << std::endl;
	flagopt = true;
	}

	if (fFluxFile == "" && (!flagopt) && (!fIsMonoEFlux)) {
	ERR(FTL) << "No flux input specified!" << std::endl;
	flagopt = true;
	}

	if (argc < 1 \|\| flagopt) {
	PrintOptions();
	exit(-1);
	}

	return;
	}
	diff --git a/cmake/NEUTSetup.cmake b/cmake/NEUTSetup.cmake
	index 85788d5..c4665af 100644
	--- a/cmake/NEUTSetup.cmake
	+++ b/cmake/NEUTSetup.cmake
	@@ -1,83 +1,114 @@
	# 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/>.
	################################################################################

	if(NEUT_ROOT STREQUAL "")
	cmessage(FATAL_ERROR "Variable NEUT_ROOT is not defined. Please export environment variable NEUT_ROOT or configure with -DNEUT_ROOT=/path/to/NEUT. This must be set to point to a prebuilt NEUT instance.")
	endif()

	if(CERN STREQUAL "")
	cmessage(FATAL_ERROR "Variable CERN is not defined. Please export environment variable CERN or configure with -DCERN=/path/to/CERNLIB. This must be set to point to a prebuilt CERNLIB instance.")
	endif()

	if(CERN_LEVEL STREQUAL "")
	cmessage(FATAL_ERROR "Variable CERN_LEVEL is not defined. Please export environment variable CERN_LEVEL or configure with -DCERN_LEVEL=XXXX (likely to be 2005).")
	endif()

	-set(NEUT_LIB_DIR ${NEUT_ROOT}/lib/Linux_pc)
	+if(NOT IS_NEUT_54)
	+ set(NEUT_LIB_DIR ${NEUT_ROOT}/lib/Linux_pc)
	+else()
	+ set(NEUT_LIB_DIR ${NEUT_ROOT}/lib)
	+endif()
	set(NEUT_CLASS ${NEUT_ROOT}/src/neutclass)

	LIST(APPEND EXTRA_CXX_FLAGS -D__NEUT_ENABLED__ )

	LIST(APPEND RWENGINE_INCLUDE_DIRECTORIES
	${NEUT_ROOT}/include
	${NEUT_ROOT}/src/neutclass
	${NEUT_ROOT}/src/reweight)

	-
	LIST(APPEND EXTRA_LINK_DIRS
	- ${NEUT_ROOT}/lib/Linux_pc
	+ ${NEUT_LIB_DIR}
	${CERN}/${CERN_LEVEL}/lib
	${NEUT_ROOT}/src/reweight)

	-LIST(APPEND EXTRA_LIBS
	- NReWeight
	- neutcore
	- nuccorrspl
	- nuceff
	- partnuck
	- skmcsvc
	- tauola
	- jetset74
	- pdflib804
	- mathlib
	- packlib
	- pawlib)
	-
	-LIST(APPEND EXTRA_SHAREDOBJS
	+if(NOT IS_NEUT_54)
	+ LIST(APPEND EXTRA_LIBS
	+ NReWeight
	+ neutcore
	+ nuccorrspl
	+ nuceff
	+ partnuck
	+ skmcsvc
	+ tauola
	+ jetset74
	+ pdflib804
	+ mathlib
	+ packlib
	+ pawlib)
	+else()
	+ LIST(APPEND EXTRA_LIBS
	+ NReWeight
	+ neutcore_5.4.0
	+ nuccorspl_5.4.0 #typo in NEUT, may hopefully disappear
	+ nuceff_5.4.0
	+ partnuck_5.4.0
	+ skmcsvc_5.4.0
	+ tauola_5.4.0
	+ HT2p2h_5.4.0
	+ N1p1h_5.4.0
	+ jetset74
	+ pdflib804
	+ mathlib
	+ packlib
	+ pawlib)
	+endif()
	+
	+set(NEUT_ROOT_LIBS)
	+
	+LIST(APPEND NEUT_ROOT_LIBS
	${NEUT_CLASS}/neutctrl.so
	${NEUT_CLASS}/neutfsivert.so)

	# Check for new versions of NEUT with NUCLEON FSI
	if(EXISTS "${NEUT_CLASS}/neutnucfsistep.so")
	set(NEUT_NUCFSI 1)
	LIST(APPEND EXTRA_CXX_FLAGS -D__NEUT_NUCFSI_ENABLED__ )

	- LIST(APPEND EXTRA_SHAREDOBJS
	+ LIST(APPEND NEUT_ROOT_LIBS
	${NEUT_CLASS}/neutnucfsistep.so
	${NEUT_CLASS}/neutnucfsivert.so
	)
	endif()

	-LIST(APPEND EXTRA_SHAREDOBJS
	- ${NEUT_CLASS}/neutrootTreeSingleton.so
	+if(NOT IS_NEUT_54)
	+ LIST(APPEND NEUT_ROOT_LIBS
	+ ${NEUT_CLASS}/neutrootTreeSingleton.so)
	+endif()
	+
	+LIST(APPEND NEUT_ROOT_LIBS
	${NEUT_CLASS}/neutvtx.so
	${NEUT_CLASS}/neutfsipart.so
	${NEUT_CLASS}/neutpart.so
	${NEUT_CLASS}/neutvect.so
	)
	+
	+foreach(OBJ ${NEUT_ROOT_LIBS})
	+ LIST(APPEND EXTRA_SHAREDOBJS ${OBJ})
	+endforeach()
	diff --git a/cmake/ROOTSetup.cmake b/cmake/ROOTSetup.cmake
	index caa6e8e..f6597a3 100644
	--- a/cmake/ROOTSetup.cmake
	+++ b/cmake/ROOTSetup.cmake
	@@ -1,169 +1,170 @@
	# 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/>.
	################################################################################

	if ( NOT DEFINED ENV{ROOTSYS} )
	cmessage (FATAL_ERROR "$ROOTSYS is not defined, please set up ROOT first.")
	else()
	cmessage(STATUS "Using ROOT installed at $ENV{ROOTSYS}")
	set(CMAKE_ROOTSYS $ENV{ROOTSYS})
	endif()

	# Get cflags from ROOT
	execute_process (COMMAND root-config
	--cflags OUTPUT_VARIABLE ROOT_CXX_FLAGS_RAW OUTPUT_STRIP_TRAILING_WHITESPACE)
	string(REPLACE " " ";" ROOT_CXX_FLAGS "${ROOT_CXX_FLAGS_RAW}")
	# Get libdir from ROOT
	execute_process (COMMAND root-config
	--libdir OUTPUT_VARIABLE ROOT_LIBDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
	# Get version from ROOT
	execute_process (COMMAND root-config
	--version OUTPUT_VARIABLE ROOT_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
	# Get features from ROOT
	execute_process (COMMAND root-config
	--features OUTPUT_VARIABLE ROOT_FEATURES OUTPUT_STRIP_TRAILING_WHITESPACE)

	LIST(APPEND EXTRA_LINK_DIRS ${ROOT_LIBDIR})

	LIST(APPEND ROOT_LIBS
	Core
	Cint
	RIO
	XMLIO
	Net
	Hist
	Graf
	Graf3d
	Gpad
	Tree
	Rint
	Postscript
	Matrix
	Physics
	MathCore
	Thread
	EG
	Geom
	GenVector)

	if(USE_MINIMIZER)

	if("${ROOT_FEATURES}" MATCHES "minuit2")
	cmessage(STATUS "ROOT built with MINUIT2 support")
	LIST(APPEND EXTRA_CXX_FLAGS -D__MINUIT2_ENABLED__)
	else()
	cmessage(FATAL_ERROR "ROOT built without MINUIT2 support but minimizer functionality requested. Either configure with -DUSE_MINIMIZER=FALSE or use a version of ROOT with MINUIT2 support.")
	endif()

	string(REGEX MATCH "6.*" ROOTVERSIXMATCH ${ROOT_VERSION})
	if(ROOTVERSIXMATCH)
	cmessage(STATUS "Using ROOT6, We are essentially flying blind here.")
	LIST(REMOVE_ITEM ROOT_LIBS Cint)
	LIST(APPEND EXTRA_CXX_FLAGS -DROOT6_USE_FIT_FITTER_INTERFACE)
	+ set(USE_ROOT6 True)
	else()
	string(REGEX MATCH "5.34/([0-9]+)" ROOTVERSMATCH ${ROOT_VERSION})
	if(NOT ROOTVERSMATCH OR ${CMAKE_MATCH_1} LESS "19")
	cmessage(FATAL_ERROR "ROOT Version: ${ROOT_VERSION} has out of date minimizer interface, but minimizer functionality requested. Please configure with -DUSE_MINIMIZER=FALSE or update to 5.34/19 or greater to enable minimization features.")
	endif()
	endif()

	endif()

	if("${ROOT_FEATURES}" MATCHES "opengl")
	cmessage(STATUS "ROOT built with OpenGL support")
	LIST(APPEND ROOT_LIBS RGL)
	endif()

	if(DEFINED NEED_ROOTPYTHIA6 AND NEED_ROOTPYTHIA6)
	LIST(APPEND ROOT_LIBS EGPythia6 Pythia6)
	endif()

	cmessage ( STATUS "[ROOT]: root-config --version: ${ROOT_VERSION} ")
	cmessage ( STATUS "[ROOT]: root-config --cflags : ${ROOT_CXX_FLAGS} ")
	cmessage ( STATUS "[ROOT]: root-config --libs : ${ROOT_LD_FLAGS} ")

	LIST(APPEND EXTRA_CXX_FLAGS ${ROOT_CXX_FLAGS})

	#Helper functions for building dictionaries
	function(GenROOTDictionary OutputDictName Header LinkDef)

	get_directory_property(incdirs INCLUDE_DIRECTORIES)
	string(REPLACE ";" ";-I" LISTDIRINCLUDES "-I${incdirs}")
	string(REPLACE " " ";" LISTCPPFLAGS "${EXTRA_CXX_FLAGS}")

	#ROOT5 CINT cannot handle it.
	list(REMOVE_ITEM LISTCPPFLAGS "-std=c++11")

	message(STATUS "LISTCPPFLAGS: ${LISTCPPFLAGS}")
	message(STATUS "LISTINCLUDES: ${LISTDIRINCLUDES}")
	#Learn how to generate the Dict.cxx and Dict.hxx
	add_custom_command(
	OUTPUT "${OutputDictName}.cxx" "${OutputDictName}.h"
	COMMAND rootcint
	ARGS -f ${OutputDictName}.cxx -c
	-p ${LISTDIRINCLUDES} ${LISTCPPFLAGS} ${Header} ${LinkDef}
	DEPENDS ${Header};${LinkDef})
	endfunction()


	function(BuildROOTProject ProjectName InputFile CommaSeparatedClassesToDump LIBLINKMODE)

	string(REPLACE "," ";" HeadersToDump ${CommaSeparatedClassesToDump})
	set(OUTPUTFILES ${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectSource.cxx
	${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}LinkDef.h
	${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectHeaders.h
	${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectInstances.h)

	cmessage(STATUS "As part of ROOT project: ${ProjectName}")
	foreach (header ${HeadersToDump})
	LIST(APPEND OUTPUTFILES "${CMAKE_BINARY_DIR}/${ProjectName}/${header}.h")
	cmessage(STATUS "Will generate: ${CMAKE_BINARY_DIR}/${ProjectName}/${header}.h")
	endforeach()

	add_custom_command(
	OUTPUT ${OUTPUTFILES}
	COMMAND ${CMAKE_BINARY_DIR}/src/Utils/DumpROOTClassesFromVector
	ARGS ${InputFile}
	${CMAKE_BINARY_DIR}/${ProjectName}
	${CommaSeparatedClassesToDump}
	VERBATIM
	DEPENDS DumpROOTClassesFromVector)

	add_custom_target(${ProjectName}_sources
	DEPENDS ${OUTPUTFILES})

	GenROOTDictionary(
	${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectDict
	${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectHeaders.h
	${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}LinkDef.h
	)

	add_custom_target(${ProjectName}ProjectDict
	DEPENDS
	${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectDict.cxx
	${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectDict.h )
	# add_dependencies(${ProjectName}ProjectDict ${ProjectName}_sources)

	#ProjectSource.cxx includes ProjectDict.cxx, so no need to add to compilation.
	set(ROAA_SOURCEFILES
	${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectSource.cxx)

	add_library(${ProjectName} ${LIBLINKMODE} ${ROAA_SOURCEFILES})
	add_dependencies(${ProjectName} ${ProjectName}ProjectDict)

	endfunction()
	diff --git a/cmake/c++CompilerSetup.cmake b/cmake/c++CompilerSetup.cmake
	index 266b708..a59c304 100644
	--- a/cmake/c++CompilerSetup.cmake
	+++ b/cmake/c++CompilerSetup.cmake
	@@ -1,109 +1,126 @@
	# 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/>.
	################################################################################

	if(USE_OMP)
	LIST(APPEND EXTRA_CXX_FLAGS -fopenmp)
	endif()

	if(USE_DYNSAMPLES)
	LIST(APPEND EXTRA_LIBS dl)
	LIST(APPEND EXTRA_CXX_FLAGS -D__USE_DYNSAMPLES__)
	endif()

	set(CXX_WARNINGS -Wall )

	cmessage(DEBUG "EXTRA_CXX_FLAGS: ${EXTRA_CXX_FLAGS}")
	string(REPLACE ";" " " STR_EXTRA_CXX_FLAGS "${EXTRA_CXX_FLAGS}")
	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${STR_EXTRA_CXX_FLAGS} ${CXX_WARNINGS}")
	set(CMAKE_Fortran_FLAGS_RELEASE "-fPIC")

	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")

	if(USE_DYNSAMPLES)
	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fPIC")
	set(CMAKE_Fortran_FLAGS_DEBUG "-fPIC")
	endif()

	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC -O3")

	if(CMAKE_BUILD_TYPE MATCHES DEBUG)
	set(CURRENT_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS_DEBUG})
	elseif(CMAKE_BUILD_TYPE MATCHES RELEASE)
	set(CURRENT_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS_RELEASE})
	else()
	cmessage(FATAL_ERROR "[ERROR]: Unknown CMAKE_BUILD_TYPE (\"${CMAKE_BUILD_TYPE}\"): Should be \"DEBUG\" or \"RELEASE\".")
	endif()


	SET(STR_EXTRA_LINK_DIRS)
	if(NOT EXTRA_LINK_DIRS STREQUAL "")
	string(REPLACE ";" " -L" STR_EXTRA_LINK_DIRS "-L${EXTRA_LINK_DIRS}")
	endif()
	SET(STR_EXTRA_LIBS)
	if(NOT EXTRA_LIBS STREQUAL "")
	string(REPLACE ";" " -l" STR_EXTRA_LIBS "-l${EXTRA_LIBS}")
	endif()
	SET(STR_EXTRA_SHAREDOBJS)
	if(NOT EXTRA_SHAREDOBJS STREQUAL "")
	string(REPLACE ";" " " STR_EXTRA_SHAREDOBJS "${EXTRA_SHAREDOBJS}")
	endif()

	SET(STR_EXTRA_LINK_FLAGS)
	if(NOT EXTRA_LINK_FLAGS STREQUAL "")
	string(REPLACE ";" " " STR_EXTRA_LINK_FLAGS "${EXTRA_LINK_FLAGS}")
	endif()

	cmessage(DEBUG "EXTRA_LINK_DIRS: ${STR_EXTRA_LINK_DIRS}")
	cmessage(DEBUG "EXTRA_LIBS: ${STR_EXTRA_LIBS}")
	cmessage(DEBUG "EXTRA_SHAREDOBJS: ${STR_EXTRA_SHAREDOBJS}")
	cmessage(DEBUG "EXTRA_LINK_FLAGS: ${STR_EXTRA_LINK_FLAGS}")

	if(NOT STR_EXTRA_LINK_DIRS STREQUAL "" AND NOT STR_EXTRA_LIBS STREQUAL "")
	SET(CMAKE_DEPENDLIB_FLAGS "${STR_EXTRA_LINK_DIRS} ${STR_EXTRA_LIBS}")
	endif()

	+if(USE_NEUT)
	+ foreach(OBJ ${NEUT_ROOT_LIBS})
	+ if(NOT CMAKE_DEPENDLIB_FLAGS STREQUAL "")
	+ SET(CMAKE_DEPENDLIB_FLAGS "${CMAKE_DEPENDLIB_FLAGS} ${OBJ}")
	+ else()
	+ SET(CMAKE_DEPENDLIB_FLAGS "${OBJ}")
	+ endif()
	+ endforeach()
	+ foreach(OBJ ${NEUT_ROOT_LIBS})
	+ if(NOT CMAKE_DEPENDLIB_FLAGS STREQUAL "")
	+ SET(CMAKE_DEPENDLIB_FLAGS "${CMAKE_DEPENDLIB_FLAGS} ${OBJ}")
	+ else()
	+ SET(CMAKE_DEPENDLIB_FLAGS "${OBJ}")
	+ endif()
	+ endforeach()
	+endif()
	+
	if(NOT EXTRA_SHAREDOBJS STREQUAL "")
	if(NOT STR_EXTRA_LINK_FLAGS STREQUAL "")
	SET(STR_EXTRA_LINK_FLAGS "${STR_EXTRA_SHAREDOBJS} ${STR_EXTRA_LINK_FLAGS}")
	else()
	SET(STR_EXTRA_LINK_FLAGS "${STR_EXTRA_SHAREDOBJS}")
	endif()
	endif()

	if(NOT EXTRA_LINK_FLAGS STREQUAL "")
	if(NOT CMAKE_LINK_FLAGS STREQUAL "")
	SET(CMAKE_LINK_FLAGS "${CMAKE_LINK_FLAGS} ${STR_EXTRA_LINK_FLAGS}")
	else()
	SET(CMAKE_LINK_FLAGS "${STR_EXTRA_LINK_FLAGS}")
	endif()
	endif()

	if(USE_OMP)
	cmessage(FATAL_ERROR "No OMP features currently enabled so this is a FATAL_ERROR to let you know that you don't gain anything with this declaration.")
	endif()


	if (VERBOSE)
	cmessage (STATUS "C++ Compiler : ${CXX_COMPILER_NAME}")
	cmessage (STATUS " flags : ${CMAKE_CXX_FLAGS}")
	cmessage (STATUS " Release flags : ${CMAKE_CXX_FLAGS_RELEASE}")
	cmessage (STATUS " Debug flags : ${CMAKE_CXX_FLAGS_DEBUG}")
	cmessage (STATUS " Link Flags : ${CMAKE_LINK_FLAGS}")
	cmessage (STATUS " Lib Flags : ${CMAKE_DEPENDLIB_FLAGS}")
	endif()
	diff --git a/cmake/cacheVariables.cmake b/cmake/cacheVariables.cmake
	index 5e6f1fc..3d52cee 100644
	--- a/cmake/cacheVariables.cmake
	+++ b/cmake/cacheVariables.cmake
	@@ -1,213 +1,216 @@
	# 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/>.
	################################################################################

	function(CheckAndSetDefaultEnv VARNAME DEFAULT CACHETYPE DOCSTRING ENVNAME)
	#cmessage(DEBUG "Trying to assign variable ${VARNAME} into the cache.")
	if(NOT DEFINED ${VARNAME})
	if(DEFINED ENV{${ENVNAME}} AND NOT $ENV{${ENVNAME}} STREQUAL "")
	set(${VARNAME} $ENV{${ENVNAME}} CACHE ${CACHETYPE} ${DOCSTRING})
	cmessage(DEBUG " Read ${VARNAME} from ENVVAR ${ENVNAME} as $ENV{${ENVNAME}}.")
	else()
	set(${VARNAME} ${DEFAULT} CACHE ${CACHETYPE} ${DOCSTRING})
	endif()
	else()
	set(${VARNAME} ${${VARNAME}} CACHE ${CACHETYPE} ${DOCSTRING})
	unset(${VARNAME})
	endif()
	cmessage(CACHE "--Set cache variable: \"${VARNAME}\" to \"${${VARNAME}}\", in cache ${CACHETYPE}.")
	endfunction()

	function(CheckAndSetDefaultCache VARNAME DEFAULT CACHETYPE DOCSTRING)
	# cmessage(DEBUG "Trying to assign variable ${VARNAME} into the cache.")
	if(NOT DEFINED ${VARNAME})
	set(${VARNAME} ${DEFAULT} CACHE ${CACHETYPE} ${DOCSTRING})
	else()
	set(${VARNAME} ${${VARNAME}} CACHE ${CACHETYPE} ${DOCSTRING})
	unset(${VARNAME})
	endif()
	cmessage(CACHE "--Set cache variable: \"${VARNAME}\" to \"${${VARNAME}}\", in cache ${CACHETYPE}.")
	endfunction()

	function(CheckAndSetDefault VARNAME DEFAULT)
	# cmessage(DEBUG "Trying to assign variable ${VARNAME}.")
	if(NOT DEFINED ${VARNAME})
	set(${VARNAME} ${DEFAULT} PARENT_SCOPE)
	set(${VARNAME} ${DEFAULT})
	endif()
	cmessage(CACHE "--Set variable: \"${VARNAME}\" to \"${${VARNAME}}\".")
	endfunction()

	CheckAndSetDefaultCache(VERBOSE TRUE BOOL "Whether to configure loudly.")

	set (CMAKE_SKIP_BUILD_RPATH TRUE)

	#Changes default install path to be a subdirectory of the build dir.
	#Can set build dir at configure time with -DCMAKE_INSTALL_PREFIX=/install/path
	if(CMAKE_INSTALL_PREFIX STREQUAL "" OR CMAKE_INSTALL_PREFIX STREQUAL
	"/usr/local")
	set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/${CMAKE_SYSTEM_NAME}")
	elseif(NOT DEFINED CMAKE_INSTALL_PREFIX)
	set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/${CMAKE_SYSTEM_NAME}")
	endif()

	if(CMAKE_BUILD_TYPE STREQUAL "")
	set(CMAKE_BUILD_TYPE DEBUG)
	elseif(NOT DEFINED CMAKE_BUILD_TYPE)
	set(CMAKE_BUILD_TYPE DEBUG)
	endif()

	CheckAndSetDefaultCache(EXTRA_SETUP_SCRIPT "" PATH "The path to an extra script to inject into the NUISANCE setup script. <>")

	CheckAndSetDefaultCache(USE_MINIMIZER TRUE INTERNAL "Whether we are using the ROOT minimization libraries. <TRUE>")

	+CheckAndSetDefaultCache(USE_ROOT6 FALSE INTERNAL "Whether we are using the ROOT 6. <FALSE>")
	+
	CheckAndSetDefaultCache(USE_HEPMC FALSE BOOL "Whether to enable HepMC input support. <FALSE>")
	CheckAndSetDefaultEnv(HEPMC "" PATH "Path to HepMC source tree root directory. Overrides environment variable \$HEPMC <>" HEPMC)
	CheckAndSetDefaultCache(HEPMC_MOMUNIT "GEV" STRING "HepMC momentum units [MEV\|GEV]. <GEV>")
	CheckAndSetDefaultCache(HEPMC_LENUNIT "CM" STRING "HepMC momentum units [MM\|CM]. <CM>")
	CheckAndSetDefaultCache(HEPMC_USED_EP FALSE INTERNAL "Whether we built HepMC or not. <FALSE>")

	CheckAndSetDefaultCache(USE_NEUT FALSE BOOL "Whether to enable NEUT (reweight) support. Requires external libraries. <FALSE>")
	+CheckAndSetDefaultCache(IS_NEUT_54 FALSE BOOL "Whether to enabled NEUT is version 5.4 or greater. <FALSE>")
	CheckAndSetDefaultEnv(NEUT_ROOT "" PATH "Path to NEUT source tree root directory. Overrides environment variable \$NEUT_ROOT <>" NEUT_ROOT)
	CheckAndSetDefaultEnv(CERN "" PATH "Path to CERNLIB source tree root directory that NEUT was built against. Overrides environment variable \$CERN <>" CERN)
	CheckAndSetDefaultEnv(CERN_LEVEL "" STRING "CERNLIB Library version. Overrides environment variable \$CERN_LEVEL <>" CERN_LEVEL)

	CheckAndSetDefaultCache(USE_NuWro FALSE BOOL "Whether to enable NuWro support. <FALSE>")
	CheckAndSetDefaultEnv(NUWRO "" PATH "Path to NuWro source tree root directory. Overrides environment variable \$NUWRO <>" NUWRO)
	CheckAndSetDefaultEnv(NUWRO_INC "" PATH "Path to NuWro installed includes directory, needs to contain \"params_all.h\". Overrides environment variable \$NUWRO_INC <>" NUWRO_INC)
	CheckAndSetDefaultCache(NUWRO_INPUT_FILE "" FILEPATH "Path to an input NuWro event vector, which can be used to build NuWro i/o libraries. <>")
	CheckAndSetDefaultCache(NUWRO_BUILT_FROM_FILE FALSE INTERNAL "Whether the NuWro libraries were built by NUISANCE. <FALSE>")
	CheckAndSetDefaultCache(USE_NuWro_RW FALSE BOOL "Whether to try and build support for NuWro reweighting. <FALSE>")
	CheckAndSetDefaultCache(USE_NuWro_SRW_Event FALSE BOOL "Whether to use cut down NuWro reweight event format. Requires NuWro reweight. <FALSE>")

	CheckAndSetDefaultCache(USE_GENIE FALSE BOOL "Whether to enable GENIE (reweight) support. Requires external libraries. <FALSE>")
	CheckAndSetDefaultCache(GENIE_VERSION "AUTO" STRING "GENIE Version <AUTO>")
	CheckAndSetDefaultEnv(GENIE "" PATH "Path to GENIE source tree root directory. Overrides environment variable \$GENIE <>" GENIE)
	CheckAndSetDefaultEnv(LHAPDF_LIB "" PATH "Path to pre-built LHAPDF libraries. Overrides environment variable \$LHAPDF_LIB. <>" LHAPDF_LIB)
	CheckAndSetDefaultEnv(LHAPDF_INC "" PATH "Path to installed LHAPDF headers. Overrides environment variable \$LHAPDF_INC. <>" LHAPDF_INC)
	CheckAndSetDefaultEnv(LHAPATH "" PATH "Path to LHA PDF inputs. Overrides environment variable \$LHAPATH. <>" LHAPATH)
	CheckAndSetDefaultEnv(LIBXML2_LIB "" PATH "Path to pre-built LIBXML2 libraries. Overrides environment variable \$LIBXML2_LIB. <>" LIBXML2_LIB)
	CheckAndSetDefaultEnv(LIBXML2_INC "" PATH "Path to installed LIBXML2 headers. Overrides environment variable \$LIBXML2_INC. <>" LIBXML2_INC)
	CheckAndSetDefaultEnv(LOG4CPP_LIB "" PATH "Path to pre-built LOG4CPP libraries. Overrides environment variable \$LOG4CPP_LIB. <>" LOG4CPP_LIB)
	CheckAndSetDefaultEnv(LOG4CPP_INC "" PATH "Path to installed LOG4CPP headers. Overrides environment variable \$LOG4CPP_INC. <>" LOG4CPP_INC)

	CheckAndSetDefaultCache(BUILD_GEVGEN FALSE BOOL "Whether to build nuisance_gevgen app.")

	CheckAndSetDefaultCache(USE_T2K FALSE BOOL "Whether to enable T2KReWeight support. Requires external libraries. <FALSE>")
	CheckAndSetDefaultEnv(T2KREWEIGHT "" PATH "Path to installed T2KREWEIGHTReWeight. Overrides environment variable \$T2KREWEIGHT. <>" T2KREWEIGHT)

	CheckAndSetDefaultCache(USE_NIWG FALSE BOOL "Whether to enable (T2K) NIWG ReWeight support. Requires external libraries. <FALSE>")
	CheckAndSetDefaultEnv(NIWG_ROOT "" PATH "Path to installed NIWGReWeight. Overrides environment variable \$NIWG. <>" NIWG)

	CheckAndSetDefaultCache(USE_MINERvA_RW FALSE BOOL "Whether to enable MINERvA ReWeight support. <FALSE>")

	CheckAndSetDefaultEnv(PYTHIA6 "" PATH "Path to directory containing libPythia6.so. Overrides environment variable \$PYTHIA6 <>" PYTHIA6)

	CheckAndSetDefaultEnv(PYTHIA8 "" PATH "Path to directory containing libPythia8.so. Overrides environment variable \$PYTHIA8 <>" PYTHIA8)
	CheckAndSetDefaultCache(USE_PYTHIA8 FALSE BOOL "Whether to enable PYTHIA8 event support. <FALSE>")

	CheckAndSetDefaultCache(USE_GiBUU TRUE BOOL "Whether to enable GiBUU event support. <TRUE>")
	CheckAndSetDefaultCache(BUILD_GiBUU FALSE BOOL "Whether to build supporting GiBUU event tools along with a patched version of GiBUU. <FALSE>")

	CheckAndSetDefaultCache(USE_NUANCE TRUE BOOL "Whether to enable NUANCE event support. <TRUE>")

	CheckAndSetDefaultCache(USE_PROB3PP FALSE BOOL "Whether to download and compile in Prob3++ support. <FALSE>")

	CheckAndSetDefaultCache(NO_EXTERNAL_UPDATE FALSE BOOL "Whether to perform the update target for external dependencies. Note this may produce errors for CMake < 3.8 where a bug was fixed for the feature that this option invokes. <FALSE>")

	CheckAndSetDefaultCache(USE_GPERFTOOLS FALSE BOOL "Whether to compile in google performance tools. <FALSE>")

	CheckAndSetDefault(NEED_PYTHIA6 FALSE)
	CheckAndSetDefault(NEED_PYTHIA8 FALSE)

	CheckAndSetDefault(NEED_ROOTEVEGEN FALSE)
	CheckAndSetDefault(NEED_ROOTPYTHIA6 FALSE)

	CheckAndSetDefaultCache(USE_OMP FALSE BOOL "Whether to enable multicore features (there currently are none...). <FALSE>")

	CheckAndSetDefaultCache(USE_DYNSAMPLES TRUE BOOL "Whether to enable the dynamic sample loader. <TRUE>")

	CheckAndSetDefault(NO_EXPERIMENTS FALSE)

	cmessage(STATUS "NO_EXPERIMENTS: ${NO_EXPERIMENTS}")

	CheckAndSetDefaultCache(NO_ANL ${NO_EXPERIMENTS} BOOL "Whether to NOT build ANL samples. <-DNO_EXPERIMENTS=FALSE>")
	CheckAndSetDefaultCache(NO_ArgoNeuT ${NO_EXPERIMENTS} BOOL "Whether to NOT build ArgoNeuT samples. <-DNO_EXPERIMENTS=FALSE>")
	CheckAndSetDefaultCache(NO_BEBC ${NO_EXPERIMENTS} BOOL "Whether to NOT build BEBC samples. <-DNO_EXPERIMENTS=FALSE>")
	CheckAndSetDefaultCache(NO_BNL ${NO_EXPERIMENTS} BOOL "Whether to NOT build BNL samples. <-DNO_EXPERIMENTS=FALSE>")
	CheckAndSetDefaultCache(NO_FNAL ${NO_EXPERIMENTS} BOOL "Whether to NOT build FNAL samples. <-DNO_EXPERIMENTS=FALSE>")
	CheckAndSetDefaultCache(NO_GGM ${NO_EXPERIMENTS} BOOL "Whether to NOT build GGM samples. <-DNO_EXPERIMENTS=FALSE>")
	CheckAndSetDefaultCache(NO_K2K ${NO_EXPERIMENTS} BOOL "Whether to NOT build K2K samples. <-DNO_EXPERIMENTS=FALSE>")
	CheckAndSetDefaultCache(NO_MINERvA ${NO_EXPERIMENTS} BOOL "Whether to NOT build MINERvA samples. <-DNO_EXPERIMENTS=FALSE>")
	CheckAndSetDefaultCache(NO_MiniBooNE ${NO_EXPERIMENTS} BOOL "Whether to NOT build MiniBooNE samples. <-DNO_EXPERIMENTS=FALSE>")
	CheckAndSetDefaultCache(NO_T2K ${NO_EXPERIMENTS} BOOL "Whether to NOT build T2K samples. <-DNO_EXPERIMENTS=FALSE>")
	CheckAndSetDefaultCache(NO_SciBooNE ${NO_EXPERIMENTS} BOOL "Whether to NOT build SciBooNE samples. <-DNO_EXPERIMENTS=FALSE>")


	function(SAYVARS)

	LIST(APPEND VARS
	USE_HEPMC
	HEPMC
	HEPMC_MOMUNIT
	HEPMC_LENUNIT
	HEPMC_USED_EP
	USE_NEUT
	NEUT_ROOT
	CERN
	CERN_LEVEL
	USE_NuWro
	NUWRO
	NUWRO_INC
	NUWRO_INPUT_FILE
	NUWRO_BUILT_FROM_FILE
	USE_GENIE
	GENIE
	LHAPDF_LIB
	LHAPDF_INC
	LIBXML2_LIB
	LIBXML2_INC
	LOG4CPP_LIB
	GENIE_LOG4CPP_INC
	BUILD_GEVGEN
	USE_T2K
	USE_NIWG
	USE_GiBUU
	BUILD_GiBUU
	USE_NUANCE
	NO_EXTERNAL_UPDATE
	USE_GPERFTOOLS
	NO_ANL
	NO_ArgoNeuT
	NO_BEBC
	NO_BNL
	NO_FNAL
	NO_GGM
	NO_K2K
	NO_MINERvA
	NO_MiniBooNE
	NO_T2K
	NO_SciBooNE)

	foreach(v ${VARS})
	if(DEFINED ${v})
	cmessage(DEBUG "VARIABLE: \"${v}\" = \"${${v}}\"")
	endif()
	endforeach(v)

	endfunction()
	diff --git a/cmake/setup.sh.in b/cmake/setup.sh.in
	index 2fbbe90..123aaef 100644
	--- a/cmake/setup.sh.in
	+++ b/cmake/setup.sh.in
	@@ -1,155 +1,155 @@
	# 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/>.
	################################################################################

	#!/bin/sh

	### Adapted from https://unix.stackexchange.com/questions/4965/keep-duplicates-out-of-path-on-source
	function add_to_PATH () {
	for d; do

	d=$(cd -- "$d" && { pwd -P \|\| pwd; }) 2>/dev/null # canonicalize symbolic links
	if [ -z "$d" ]; then continue; fi # skip nonexistent directory

	if [ "$d" == "/usr/bin" ] \|\| [ "$d" == "/usr/bin64" ] \|\| [ "$d" == "/usr/local/bin" ] \|\| [ "$d" == "/usr/local/bin64" ]; then
	case ":$PATH:" in
	":$d:") :;;
	*) export PATH=$PATH:$d;;
	esac
	else
	case ":$PATH:" in
	":$d:") :;;
	*) export PATH=$d:$PATH;;
	esac
	fi
	done
	}

	function add_to_LD_LIBRARY_PATH () {
	for d; do

	d=$(cd -- "$d" && { pwd -P \|\| pwd; }) 2>/dev/null # canonicalize symbolic links
	if [ -z "$d" ]; then continue; fi # skip nonexistent directory

	if [ "$d" == "/usr/lib" ] \|\| [ "$d" == "/usr/lib64" ] \|\| [ "$d" == "/usr/local/lib" ] \|\| [ "$d" == "/usr/local/lib64" ]; then
	case ":$LD_LIBRARY_PATH:" in
	":$d:") :;;
	*) export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$d;;
	esac
	else
	case ":$LD_LIBRARY_PATH:" in
	":$d:") :;;
	*) export LD_LIBRARY_PATH=$d:$LD_LIBRARY_PATH;;
	esac
	fi
	done
	}

	if [ "@EXTRA_SETUP_SCRIPT@" ]; then
	if [ ! -e @EXTRA_SETUP_SCRIPT@ ]; then
	echo "[WARN]: Extra setup script \"@EXTRA_SETUP_SCRIPT@\" requested, but could not be found. Skipping..."
	else
	echo "[INFO]: Sourcing extra setup from \"@EXTRA_SETUP_SCRIPT@\"."
	. @EXTRA_SETUP_SCRIPT@
	fi
	fi

	add_to_PATH "@CMAKE_INSTALL_PREFIX@/bin"

	add_to_LD_LIBRARY_PATH "@CMAKE_INSTALL_PREFIX@/lib"

	if [ ! "${ROOTSYS}" ]; then
	echo "[INFO]: Sourcing ROOT from: @CMAKE_ROOTSYS@"
	source "@CMAKE_ROOTSYS@/bin/thisroot.sh"
	fi

	if [ "@USE_T2K@" != "FALSE" ]; then
	echo "[INFO]: Adding T2K paths to the environment."
	export T2KREWEIGHT=@T2KREWEIGHT@
	add_to_LD_LIBRARY_PATH "@T2KREWEIGHT@/lib"
	fi

	if [ "@USE_NIWG@" != "FALSE" ]; then
	echo "[INFO]: Adding NIWG paths to the environment."
	export NIWG=@NIWG_ROOT@
	export NIWGREWEIGHT_INPUTS=@NIWG_ROOT@/inputs
	add_to_LD_LIBRARY_PATH "@NIWG_ROOT@"
	fi

	if [ "@USE_NEUT@" != "FALSE" ]; then
	echo "[INFO]: Adding NEUT library paths to the environment."
	export NEUT_ROOT=@NEUT_ROOT@
	export CERN=@CERN@
	export CERN_LEVEL=@CERN_LEVEL@
	- add_to_LD_LIBRARY_PATH "${NEUT_ROOT}/lib/Linux_pc" "${NEUT_ROOT}/src/reweight"
	+ add_to_LD_LIBRARY_PATH "${NEUT_LIB_DIR}" "${NEUT_ROOT}/src/reweight"
	fi

	if [ "@USE_NuWro@" != "FALSE" ]; then
	if [ "@NUWRO_BUILT_FROM_FILE@" == "FALSE" ]; then
	echo "[INFO]: Adding NuWro library paths to the environment."
	export NUWRO="@NUWRO@"

	add_to_PATH "@NUWRO@/bin"
	add_to_LD_LIBRARY_PATH "@NUWRO@/build/@CMAKE_SYSTEM_NAME@/lib"

	if [ "@NUWRO_INC@" ]; then
	export NUWRO_INC=@NUWRO_INC@
	fi

	else
	echo "[INFO]: NuWro support included from input event file."
	fi
	fi

	if [ "@NEED_PYTHIA6@" != "FALSE" ]; then
	echo "[INFO]: Adding PYTHIA6 library paths to the environment."
	export PYTHIA6="@PYTHIA6@"

	add_to_LD_LIBRARY_PATH "@PYTHIA6@"
	fi

	if [ "@USE_GENIE@" != "FALSE" ]; then
	echo "[INFO]: Adding GENIE paths to the environment."

	export GENIE="@GENIE@"

	export LHAPDF_LIB="@LHAPDF_LIB@"
	export LHAPDF_INC="@LHAPDF_INC@"

	export LIBXML2_LIB="@LIBXML2_LIB@"
	export LIBXML2_INC="@LIBXML2_INC@"

	export LOG4CPP_LIB="@LOG4CPP_LIB@"
	export LOG4CPP_INC="@LOG4CPP_INC@"

	if [ "@LHAPATH@" ]; then
	export LHAPATH="@LHAPATH@"
	fi

	add_to_PATH "@GENIE@/bin"

	add_to_LD_LIBRARY_PATH "@GENIE@/lib" "@LHAPDF_LIB@" "@LIBXML2_LIB@" "@LOG4CPP_LIB@"

	fi

	if [ "@BUILD_GiBUU@" != "FALSE" ]; then
	echo "[INFO]: Sourcing GiBUU tools."
	source @CMAKE_BINARY_DIR@/GiBUUTools/src/GiBUUTools-build/Linux/setup.sh
	fi

	export NUISANCE="@CMAKE_SOURCE_DIR@"
	diff --git a/src/InputHandler/InteractionModes.h b/src/InputHandler/InteractionModes.h
	index f381f30..22d6adf 100644
	--- a/src/InputHandler/InteractionModes.h
	+++ b/src/InputHandler/InteractionModes.h
	@@ -1,91 +1,121 @@
	// 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/>.
	-*******************************************************************************/
	+ * 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/>.
	+ *******************************************************************************/
	#ifndef INTERACTION_MODES_H
	#define INTERACTION_MODES_H

	+#include <iostream>
	+
	namespace InputHandler {

	enum InteractionModes {
	- kCCQE = 1,
	- kCC2p2h = 2,
	- kCC1piponp = 11,
	- kCC1pi0onn = 12,
	- kCC1piponn = 13,
	- kCCCoherent = 16,
	- kCC1gamma = 17,
	- kCCmultipi = 21,
	- kCC1etaonn = 22,
	- kCC1kaonp = 23,
	- kCCDIS = 26,
	- kNC1pi0onn = 31,
	- kNC1pi0onp = 32,
	- kNC1pimonn = 33,
	- kNC1piponp = 34,
	- kNCCoherent = 36,
	- kNC1gamman = 38,
	- kNC1gammap = 39,
	- kNCmultipi = 41,
	- kNC1etaonn = 42,
	- kNC1etaonp = 43,
	- kNC1kaon0 = 44,
	- kNC1kaonp = 45,
	- kNCDIS = 46,
	- kNCELonp = 51,
	- kNCELonn = 52,
	- kNC2p2h = 53
	-}
	+ kCCQE = 1,
	+ kCC2p2h = 2,
	+ kCC1piponp = 11,
	+ kCC1pi0onn = 12,
	+ kCC1piponn = 13,
	+ kCCCoherent = 16,
	+ kCC1gamma = 17,
	+ kCCmultipi = 21,
	+ kCC1etaonn = 22,
	+ kCC1kaonp = 23,
	+ kCCDIS = 26,
	+ kNC1pi0onn = 31,
	+ kNC1pi0onp = 32,
	+ kNC1pimonn = 33,
	+ kNC1piponp = 34,
	+ kNCCoherent = 36,
	+ kNC1gamman = 38,
	+ kNC1gammap = 39,
	+ kNCmultipi = 41,
	+ kNC1etaonn = 42,
	+ kNC1etaonp = 43,
	+ kNC1kaon0 = 44,
	+ kNC1kaonp = 45,
	+ kNCDIS = 46,
	+ kNCELonp = 51,
	+ kNCELonn = 52,
	+ kNC2p2h = 53
	+};
	}

	-inline std::ostream &operator<<(std::ostream &os, InputHandler::InteractionModes it) {
	-
	- switch(it){
	- case InputHandler::kCCQE: return os << "CCQE";
	- case InputHandler::kCC2p2h: return os << "CC2p2h";
	- case InputHandler::kCC1piponp: return os << "CC1piponp";
	- case InputHandler::kCC1pi0onn: return os << "CC1pi0onn";
	- case InputHandler::kCC1piponn: return os << "CC1piponn";
	- case InputHandler::kCCCoherent: return os << "CCCoherent";
	- case InputHandler::kCC1gamma: return os << "CC1gamma";
	- case InputHandler::kCCmultipi: return os << "CCmultipi";
	- case InputHandler::kCC1etaonn: return os << "CC1etaonn";
	- case InputHandler::kCC1kaonp: return os << "CC1kaonp";
	- case InputHandler::kCCDIS: return os << "CCDIS";
	- case InputHandler::kNC1pi0onn: return os << "NC1pi0onn";
	- case InputHandler::kNC1pi0onp: return os << "NC1pi0onp";
	- case InputHandler::kNC1pimonn: return os << "NC1pimonn";
	- case InputHandler::kNC1piponp: return os << "NC1piponp";
	- case InputHandler::kNCCoherent: return os << "NCCoherent";
	- case InputHandler::kNC1gamman: return os << "NC1gamman";
	- case InputHandler::kNC1gammap: return os << "NC1gammap";
	- case InputHandler::kNCmultipi: return os << "NCmultipi";
	- case InputHandler::kNC1etaonn: return os << "NC1etaonn";
	- case InputHandler::kNC1etaonp: return os << "NC1etaonp";
	- case InputHandler::kNC1kaon0: return os << "NC1kaon0";
	- case InputHandler::kNC1kaonp: return os << "NC1kaonp";
	- case InputHandler::kNCDIS: return os << "NCDIS";
	- case InputHandler::kNCELonp: return os << "NCELonp";
	- case InputHandler::kNCELonn: return os << "NCELonn";
	- case InputHandler::kNC2p2h: return os << "NC2p2h";
	- default: return os << "UNKNOWN";
	- }
	- return os << "UNKNOWN";
	+inline std::ostream &operator<<(std::ostream &os,
	+ InputHandler::InteractionModes it) {

	+ switch (it) {
	+ case InputHandler::kCCQE:
	+ return os << "CCQE";
	+ case InputHandler::kCC2p2h:
	+ return os << "CC2p2h";
	+ case InputHandler::kCC1piponp:
	+ return os << "CC1piponp";
	+ case InputHandler::kCC1pi0onn:
	+ return os << "CC1pi0onn";
	+ case InputHandler::kCC1piponn:
	+ return os << "CC1piponn";
	+ case InputHandler::kCCCoherent:
	+ return os << "CCCoherent";
	+ case InputHandler::kCC1gamma:
	+ return os << "CC1gamma";
	+ case InputHandler::kCCmultipi:
	+ return os << "CCmultipi";
	+ case InputHandler::kCC1etaonn:
	+ return os << "CC1etaonn";
	+ case InputHandler::kCC1kaonp:
	+ return os << "CC1kaonp";
	+ case InputHandler::kCCDIS:
	+ return os << "CCDIS";
	+ case InputHandler::kNC1pi0onn:
	+ return os << "NC1pi0onn";
	+ case InputHandler::kNC1pi0onp:
	+ return os << "NC1pi0onp";
	+ case InputHandler::kNC1pimonn:
	+ return os << "NC1pimonn";
	+ case InputHandler::kNC1piponp:
	+ return os << "NC1piponp";
	+ case InputHandler::kNCCoherent:
	+ return os << "NCCoherent";
	+ case InputHandler::kNC1gamman:
	+ return os << "NC1gamman";
	+ case InputHandler::kNC1gammap:
	+ return os << "NC1gammap";
	+ case InputHandler::kNCmultipi:
	+ return os << "NCmultipi";
	+ case InputHandler::kNC1etaonn:
	+ return os << "NC1etaonn";
	+ case InputHandler::kNC1etaonp:
	+ return os << "NC1etaonp";
	+ case InputHandler::kNC1kaon0:
	+ return os << "NC1kaon0";
	+ case InputHandler::kNC1kaonp:
	+ return os << "NC1kaonp";
	+ case InputHandler::kNCDIS:
	+ return os << "NCDIS";
	+ case InputHandler::kNCELonp:
	+ return os << "NCELonp";
	+ case InputHandler::kNCELonn:
	+ return os << "NCELonn";
	+ case InputHandler::kNC2p2h:
	+ return os << "NC2p2h";
	+ default:
	+ return os << "UNKNOWN";
	+ }
	+ return os << "UNKNOWN";
	}

	#endif
	diff --git a/src/Tests/CMakeLists.txt b/src/Tests/CMakeLists.txt
	index 913f041..f02aea6 100644
	--- a/src/Tests/CMakeLists.txt
	+++ b/src/Tests/CMakeLists.txt
	@@ -1,51 +1,58 @@
	# 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/>.
	################################################################################

	include_directories(${MINIMUM_INCLUDE_DIRECTORIES})
	include_directories(${CMAKE_SOURCE_DIR}/src/Routines)
	include_directories(${CMAKE_SOURCE_DIR}/src/FCN)
	include_directories(${CMAKE_SOURCE_DIR}/src/MCStudies)
	include_directories(${CMAKE_SOURCE_DIR}/src/Smearceptance)
	include_directories(${EXP_INCLUDE_DIRECTORIES})

	-SET(TESTAPPS SignalDefTests ParserTests SmearceptanceTests FitMechanicsTest)
	+SET(TESTAPPS SignalDefTests ParserTests SmearceptanceTests)
	+
	+if(USE_MINIMIZER)
	+ # LIST(APPEND TESTAPPS FitMechanicsTests)
	+endif()

	foreach(appimpl ${TESTAPPS})
	add_executable(${appimpl} ${appimpl}.cxx)
	set(TARGETS_TO_BUILD ${TARGETS_TO_BUILD};${appimpl})
	target_link_libraries(${appimpl} ${MODULETargets})
	target_link_libraries(${appimpl} ${CMAKE_DEPENDLIB_FLAGS})
	target_link_libraries(${appimpl} ${ROOT_LIBS})
	if(NOT "${CMAKE_LINK_FLAGS}" STREQUAL "")
	set_target_properties(${appimpl} PROPERTIES LINK_FLAGS ${CMAKE_LINK_FLAGS})
	endif()
	install(TARGETS ${appimpl} DESTINATION tests)
	add_test(${appimpl} ${appimpl} 1)
	endforeach()

	-add_library(DummySample SHARED DummySample.cxx)
	-target_link_libraries(DummySample ${MODULETargets})
	-target_link_libraries(DummySample ${CMAKE_DEPENDLIB_FLAGS})
	-target_link_libraries(DummySample ${ROOT_LIBS})
	+list (FIND TESTAPPS FitMechanicsTests _index)
	+if (${_index} GREATER -1)
	+ add_library(DummySample SHARED DummySample.cxx)
	+ target_link_libraries(DummySample ${MODULETargets})
	+ target_link_libraries(DummySample ${CMAKE_DEPENDLIB_FLAGS})
	+ target_link_libraries(DummySample ${ROOT_LIBS})

	-if(NOT "${CMAKE_LINK_FLAGS}" STREQUAL "")
	- set_target_properties(DummySample PROPERTIES LINK_FLAGS ${CMAKE_LINK_FLAGS})
	-endif()
	+ if(NOT "${CMAKE_LINK_FLAGS}" STREQUAL "")
	+ set_target_properties(DummySample PROPERTIES LINK_FLAGS ${CMAKE_LINK_FLAGS})
	+ endif()

	-install(TARGETS DummySample DESTINATION tests)
	+ install(TARGETS DummySample DESTINATION tests)
	+endif()

File Metadata

Mime Type: text/x-diff
Expires: Tue, Nov 19, 5:45 PM (1 d, 17 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 3805445
Default Alt Text: (56 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions