diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_antinu.cxx b/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_antinu.cxx
index 8f78615..2ee44ec 100644
--- a/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_antinu.cxx
+++ b/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_antinu.cxx
@@ -1,87 +1,87 @@
 // 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 "MINERvA_SignalDef.h"
 
 #include "MINERvA_CCCOHPI_XSec_1DEnu_antinu.h"
 
 
 //********************************************************************
 MINERvA_CCCOHPI_XSec_1DEnu_antinu::MINERvA_CCCOHPI_XSec_1DEnu_antinu(nuiskey samplekey) {
 //********************************************************************
 
   // Sample overview ---------------------------------------------------
   std::string descrip = "MINERvA_CCCOHPI_XSec_1DEnu_antinu sample. \n" \
                         "Target: CH \n" \
                         "Flux: MINERvA Reverse Horn Current numu \n" \
                         "Signal: Any event with 1 mu+, 1pi-, and no other FS particles \n";
 
   // Setup common settings
   fSettings = LoadSampleSettings(samplekey);
   fSettings.SetDescription(descrip);
-  fSettings.SetXTitle("E_{#nu} (MeV)");
+  fSettings.SetXTitle("E_{#nu} (GeV)");
   fSettings.SetYTitle("d#sigma/dE_{#nu} (cm^{2}/GeV/C^{12})");
   fSettings.SetAllowedTypes("FIX,FREE,SHAPE/DIAG,FULL/NORM/MASK", "FIX/FULL");
   fSettings.SetEnuRange(1.5, 20.0);
   fSettings.DefineAllowedTargets("C,H");
   fSettings.DefineAllowedSpecies("numub");
   fSettings.SetTitle("MINERvA_CCCOHPI_XSec_1DEnu_antinu");
 
   fSettings.SetDataInput( GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/Enu_antinu_XSec.csv");
   fSettings.SetCovarInput(GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/Enu_antinu_Covar_stat.csv;" +
 			  GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/Enu_antinu_Covar_flux.csv;" +
 			  GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/Enu_antinu_Covar_sys.csv");
 			   
   FinaliseSampleSettings();
 
   // Scaling Setup ---------------------------------------------------
   // ScaleFactor automatically setup for DiffXSec/cm2/Nucleon
   fScaleFactor = GetEventHistogram()->Integral("width") * double(1E-38) / double(fNEvents)*13;
    
   // Plot Setup -------------------------------------------------------
   SetDataFromTextFile( fSettings.GetDataInput() );
   SetCovarFromMultipleTextFiles(fSettings.GetCovarInput());
 
   // Apply scalings based on the data release
   ScaleData(1E-39);
 
   // Final setup  ---------------------------------------------------
   FinaliseMeasurement();
 
 };
 
 
 void MINERvA_CCCOHPI_XSec_1DEnu_antinu::FillEventVariables(FitEvent *event) {
 
   fXVar = event->GetNeutrinoIn()->fP.E()/1000.;
   return;
 };
 
 //********************************************************************
 bool MINERvA_CCCOHPI_XSec_1DEnu_antinu::isSignal(FitEvent *event) {
 //********************************************************************
   // Signal: numu + 12C --> mu- + pi+ + 12C'
   return SignalDef::isCCCOH(event, -14, -211, EnuMin, EnuMax);
 }
 
 
 double MINERvA_CCCOHPI_XSec_1DEnu_antinu::GetLikelihood(){
   double chi2 = StatUtils::GetChi2FromCov(this->fDataHist, this->fMCHist, this->covar, NULL, 1E39, 10);
   return chi2;
 }
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_nu.cxx b/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_nu.cxx
index 90252ef..f38eb52 100644
--- a/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_nu.cxx
+++ b/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEnu_nu.cxx
@@ -1,87 +1,87 @@
 // 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 "MINERvA_SignalDef.h"
 
 #include "MINERvA_CCCOHPI_XSec_1DEnu_nu.h"
 
 
 //********************************************************************
 MINERvA_CCCOHPI_XSec_1DEnu_nu::MINERvA_CCCOHPI_XSec_1DEnu_nu(nuiskey samplekey) {
 //********************************************************************
 
   // Sample overview ---------------------------------------------------
   std::string descrip = "MINERvA_CCCOHPI_XSec_1DEnu_nu sample. \n" \
                         "Target: CH \n" \
                         "Flux: MINERvA Forward Horn Current numu \n" \
                         "Signal: Any event with 1 mu-, 1pi+, and no other FS particles \n";
 
   // Setup common settings
   fSettings = LoadSampleSettings(samplekey);
   fSettings.SetDescription(descrip);
-  fSettings.SetXTitle("E_{#nu} (MeV)");
+  fSettings.SetXTitle("E_{#nu} (GeV)");
   fSettings.SetYTitle("d#sigma/dE_{#nu} (cm^{2}/GeV/C^{12})");
   fSettings.SetAllowedTypes("FIX,FREE,SHAPE/DIAG,FULL/NORM/MASK", "FIX/FULL");
   fSettings.SetEnuRange(1.5, 20.0);
   fSettings.DefineAllowedTargets("C,H");
   fSettings.DefineAllowedSpecies("numu");
   fSettings.SetTitle("MINERvA_CCCOHPI_XSec_1DEnu_nu");
 
   fSettings.SetDataInput( GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/Enu_nu_XSec.csv");
   fSettings.SetCovarInput(GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/Enu_nu_Covar_stat.csv;" +
 			  GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/Enu_nu_Covar_flux.csv;" +
 			  GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/Enu_nu_Covar_sys.csv");
 			   
   FinaliseSampleSettings();
 
   // Scaling Setup ---------------------------------------------------
   // ScaleFactor automatically setup for DiffXSec/cm2/Nucleon
   fScaleFactor = GetEventHistogram()->Integral("width") * double(1E-38) / double(fNEvents)*13;
    
   // Plot Setup -------------------------------------------------------
   SetDataFromTextFile( fSettings.GetDataInput() );
   SetCovarFromMultipleTextFiles(fSettings.GetCovarInput());
 
   // Apply scalings based on the data release
   ScaleData(1E-39);
 
   // Final setup  ---------------------------------------------------
   FinaliseMeasurement();
 
 };
 
 
 void MINERvA_CCCOHPI_XSec_1DEnu_nu::FillEventVariables(FitEvent *event) {
 
   fXVar = event->GetNeutrinoIn()->fP.E()/1000.;
   return;
 };
 
 //********************************************************************
 bool MINERvA_CCCOHPI_XSec_1DEnu_nu::isSignal(FitEvent *event) {
 //********************************************************************
   // Signal: numu + 12C --> mu- + pi+ + 12C'
   return SignalDef::isCCCOH(event, 14, 211, EnuMin, EnuMax);
 }
 
 
 double MINERvA_CCCOHPI_XSec_1DEnu_nu::GetLikelihood(){
   double chi2 = StatUtils::GetChi2FromCov(this->fDataHist, this->fMCHist, this->covar, NULL, 1E39, 10);
   return chi2;
 }
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_antinu.cxx b/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_antinu.cxx
index ff8e981..6baf075 100644
--- a/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_antinu.cxx
+++ b/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_antinu.cxx
@@ -1,91 +1,91 @@
 // 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 "MINERvA_SignalDef.h"
 
 #include "MINERvA_CCCOHPI_XSec_1DEpi_antinu.h"
 
 
 //********************************************************************
 MINERvA_CCCOHPI_XSec_1DEpi_antinu::MINERvA_CCCOHPI_XSec_1DEpi_antinu(nuiskey samplekey) {
 //********************************************************************
 
   // Sample overview ---------------------------------------------------
   std::string descrip = "MINERvA_CCCOHPI_XSec_1DEpi_antinu sample. \n" \
                         "Target: CH \n" \
                         "Flux: MINERvA Reverse Horn Current numu \n" \
                         "Signal: Any event with 1 mu+, 1pi-, and no other FS particles \n";
 
   // Setup common settings
   fSettings = LoadSampleSettings(samplekey);
   fSettings.SetDescription(descrip);
-  fSettings.SetXTitle("E_{#nu} (MeV)");
-  fSettings.SetYTitle("d#sigma/dE_{#nu} (cm^{2}/GeV/C^{12})");
+  fSettings.SetXTitle("E_{#pi} (GeV)");
+  fSettings.SetYTitle("d#sigma/dE_{#pi} (cm^{2}/GeV/C^{12})");
   fSettings.SetAllowedTypes("FIX,FREE,SHAPE/DIAG,FULL/NORM/MASK", "FIX/FULL");
   fSettings.SetEnuRange(1.5, 20.0);
   fSettings.DefineAllowedTargets("C,H");
   fSettings.DefineAllowedSpecies("numub");
   fSettings.SetTitle("MINERvA_CCCOHPI_XSec_1DEpi_antinu");
 
   fSettings.SetDataInput( GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/Epi_antinu_XSec.csv");
   fSettings.SetCovarInput(GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/Epi_antinu_Covar_stat.csv;" +
 			  GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/Epi_antinu_Covar_flux.csv;" +
 			  GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/Epi_antinu_Covar_sys.csv");
 			   
   FinaliseSampleSettings();
 
   // Scaling Setup ---------------------------------------------------
   // ScaleFactor automatically setup for DiffXSec/cm2/Nucleon
   fScaleFactor = GetEventHistogram()->Integral("width") * double(1E-38) / double(fNEvents)/TotalIntegratedFlux("width")*13;
    
   // Plot Setup -------------------------------------------------------
   SetDataFromTextFile( fSettings.GetDataInput() );
   SetCovarFromMultipleTextFiles(fSettings.GetCovarInput());
 
   // Apply scalings based on the data release
   ScaleData(1E-39);
 
   // Final setup  ---------------------------------------------------
   FinaliseMeasurement();
 
 };
 
 
 void MINERvA_CCCOHPI_XSec_1DEpi_antinu::FillEventVariables(FitEvent *event) {
 
   if (event->NumFSParticle(-211) == 0) return;
 
   TLorentzVector Ppi = event->GetHMFSParticle(-211)->fP;
   fXVar = Ppi.E()/1000.;
 
   return;
 };
 
 //********************************************************************
 bool MINERvA_CCCOHPI_XSec_1DEpi_antinu::isSignal(FitEvent *event) {
 //********************************************************************
   // Signal: numu + 12C --> mu- + pi+ + 12C'
   return SignalDef::isCCCOH(event, -14, -211, EnuMin, EnuMax);
 }
 
 
 double MINERvA_CCCOHPI_XSec_1DEpi_antinu::GetLikelihood(){
   double chi2 = StatUtils::GetChi2FromCov(this->fDataHist, this->fMCHist, this->covar, NULL, 1E39, 10);
   return chi2;
 }
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_nu.cxx b/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_nu.cxx
index 031a543..6701f30 100644
--- a/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_nu.cxx
+++ b/src/MINERvA/MINERvA_CCCOHPI_XSec_1DEpi_nu.cxx
@@ -1,91 +1,91 @@
 // 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 "MINERvA_SignalDef.h"
 
 #include "MINERvA_CCCOHPI_XSec_1DEpi_nu.h"
 
 
 //********************************************************************
 MINERvA_CCCOHPI_XSec_1DEpi_nu::MINERvA_CCCOHPI_XSec_1DEpi_nu(nuiskey samplekey) {
 //********************************************************************
 
   // Sample overview ---------------------------------------------------
   std::string descrip = "MINERvA_CCCOHPI_XSec_1DEpi_nu sample. \n" \
                         "Target: CH \n" \
                         "Flux: MINERvA Forward Horn Current numu \n" \
                         "Signal: Any event with 1 mu-, 1pi+, and no other FS particles \n";
 
   // Setup common settings
   fSettings = LoadSampleSettings(samplekey);
   fSettings.SetDescription(descrip);
-  fSettings.SetXTitle("E_{#nu} (MeV)");
-  fSettings.SetYTitle("d#sigma/dE_{#nu} (cm^{2}/GeV/C^{12})");
+  fSettings.SetXTitle("E_{#pi} (GeV)");
+  fSettings.SetYTitle("d#sigma/dE_{#pi} (cm^{2}/GeV/C^{12})");
   fSettings.SetAllowedTypes("FIX,FREE,SHAPE/DIAG,FULL/NORM/MASK", "FIX/FULL");
   fSettings.SetEnuRange(1.5, 20.0);
   fSettings.DefineAllowedTargets("C,H");
   fSettings.DefineAllowedSpecies("numu");
   fSettings.SetTitle("MINERvA_CCCOHPI_XSec_1DEpi_nu");
 
   fSettings.SetDataInput( GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/Epi_nu_XSec.csv");
   fSettings.SetCovarInput(GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/Epi_nu_Covar_stat.csv;" +
 			  GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/Epi_nu_Covar_flux.csv;" +
 			  GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/Epi_nu_Covar_sys.csv");
 			   
   FinaliseSampleSettings();
 
   // Scaling Setup ---------------------------------------------------
   // ScaleFactor automatically setup for DiffXSec/cm2/Nucleon
   fScaleFactor = GetEventHistogram()->Integral("width") * double(1E-38) / double(fNEvents)/TotalIntegratedFlux("width")*13;
    
   // Plot Setup -------------------------------------------------------
   SetDataFromTextFile( fSettings.GetDataInput() );
   SetCovarFromMultipleTextFiles(fSettings.GetCovarInput());
 
   // Apply scalings based on the data release
   ScaleData(1E-39);
 
   // Final setup  ---------------------------------------------------
   FinaliseMeasurement();
 
 };
 
 
 void MINERvA_CCCOHPI_XSec_1DEpi_nu::FillEventVariables(FitEvent *event) {
 
   if (event->NumFSParticle(211) == 0) return;
 
   TLorentzVector Ppi = event->GetHMFSParticle(211)->fP;
   fXVar = Ppi.E()/1000.;
 
   return;
 };
 
 //********************************************************************
 bool MINERvA_CCCOHPI_XSec_1DEpi_nu::isSignal(FitEvent *event) {
 //********************************************************************
   // Signal: numu + 12C --> mu- + pi+ + 12C'
   return SignalDef::isCCCOH(event, 14, 211, EnuMin, EnuMax);
 }
 
 
 double MINERvA_CCCOHPI_XSec_1DEpi_nu::GetLikelihood(){
   double chi2 = StatUtils::GetChi2FromCov(this->fDataHist, this->fMCHist, this->covar, NULL, 1E39, 10);
   return chi2;
 }
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_antinu.cxx b/src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_antinu.cxx
index 5165e33..1912a63 100644
--- a/src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_antinu.cxx
+++ b/src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_antinu.cxx
@@ -1,92 +1,92 @@
 // 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 "MINERvA_SignalDef.h"
 
 #include "MINERvA_CCCOHPI_XSec_1Dth_antinu.h"
 
 
 //********************************************************************
 MINERvA_CCCOHPI_XSec_1Dth_antinu::MINERvA_CCCOHPI_XSec_1Dth_antinu(nuiskey samplekey) {
 //********************************************************************
 
   // Sample overview ---------------------------------------------------
   std::string descrip = "MINERvA_CCCOHPI_XSec_1Dth_antinu sample. \n" \
                         "Target: CH \n" \
                         "Flux: MINERvA Reverse Horn Current numu \n" \
                         "Signal: Any event with 1 mu+, 1pi-, and no other FS particles \n";
 
   // Setup common settings
   fSettings = LoadSampleSettings(samplekey);
   fSettings.SetDescription(descrip);
-  fSettings.SetXTitle("E_{#nu} (MeV)");
-  fSettings.SetYTitle("d#sigma/dE_{#nu} (cm^{2}/GeV/C^{12})");
+  fSettings.SetXTitle("#theta_{#pi} (deg.)");
+  fSettings.SetYTitle("d#sigma/d#theta_{#pi} (cm^{2}/deg./C^{12})");
   fSettings.SetAllowedTypes("FIX,FREE,SHAPE/DIAG,FULL/NORM/MASK", "FIX/FULL");
   fSettings.SetEnuRange(1.5, 20.0);
   fSettings.DefineAllowedTargets("C,H");
   fSettings.DefineAllowedSpecies("numub");
   fSettings.SetTitle("MINERvA_CCCOHPI_XSec_1Dth_antinu");
 
   fSettings.SetDataInput( GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/th_antinu_XSec.csv");
   fSettings.SetCovarInput(GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/th_antinu_Covar_stat.csv;" +
 			  GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/th_antinu_Covar_flux.csv;" +
 			  GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/th_antinu_Covar_sys.csv");
 			   
   FinaliseSampleSettings();
 
   // Scaling Setup ---------------------------------------------------
   // ScaleFactor automatically setup for DiffXSec/cm2/Nucleon
   fScaleFactor = GetEventHistogram()->Integral("width") * double(1E-38) / double(fNEvents)/TotalIntegratedFlux("width")*13;
    
   // Plot Setup -------------------------------------------------------
   SetDataFromTextFile( fSettings.GetDataInput() );
   SetCovarFromMultipleTextFiles(fSettings.GetCovarInput());
 
   // Apply scalings based on the data release
   ScaleData(1E-39);
 
   // Final setup  ---------------------------------------------------
   FinaliseMeasurement();
 
 };
 
 
 void MINERvA_CCCOHPI_XSec_1Dth_antinu::FillEventVariables(FitEvent *event) {
 
   if (event->NumFSParticle(-211) == 0) return;
 
   TLorentzVector Pnu = event->GetNeutrinoIn()->fP;
   TLorentzVector Ppi = event->GetHMFSParticle(-211)->fP;
   fXVar = (180. / M_PI) * FitUtils::th(Pnu, Ppi);
 
   return;
 };
 
 //********************************************************************
 bool MINERvA_CCCOHPI_XSec_1Dth_antinu::isSignal(FitEvent *event) {
 //********************************************************************
-  // Signal: numu + 12C --> mu- + pi+ + 12C'
+  // Signal: numub + 12C --> mu+ + pi- + 12C'
   return SignalDef::isCCCOH(event, -14, -211, EnuMin, EnuMax);
 }
 
 
 double MINERvA_CCCOHPI_XSec_1Dth_antinu::GetLikelihood(){
   double chi2 = StatUtils::GetChi2FromCov(this->fDataHist, this->fMCHist, this->covar, NULL, 1E39, 10);
   return chi2;
 }
diff --git a/src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_nu.cxx b/src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_nu.cxx
index b22c4fc..95f2706 100644
--- a/src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_nu.cxx
+++ b/src/MINERvA/MINERvA_CCCOHPI_XSec_1Dth_nu.cxx
@@ -1,92 +1,92 @@
 // 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 "MINERvA_SignalDef.h"
 
 #include "MINERvA_CCCOHPI_XSec_1Dth_nu.h"
 
 
 //********************************************************************
 MINERvA_CCCOHPI_XSec_1Dth_nu::MINERvA_CCCOHPI_XSec_1Dth_nu(nuiskey samplekey) {
 //********************************************************************
 
   // Sample overview ---------------------------------------------------
   std::string descrip = "MINERvA_CCCOHPI_XSec_1Dth_nu sample. \n" \
                         "Target: CH \n" \
                         "Flux: MINERvA Forward Horn Current numu \n" \
                         "Signal: Any event with 1 mu-, 1pi+, and no other FS particles \n";
 
   // Setup common settings
   fSettings = LoadSampleSettings(samplekey);
   fSettings.SetDescription(descrip);
-  fSettings.SetXTitle("E_{#nu} (MeV)");
-  fSettings.SetYTitle("d#sigma/dE_{#nu} (cm^{2}/GeV/C^{12})");
+  fSettings.SetXTitle("#theta_{#pi} (deg.)");
+  fSettings.SetYTitle("d#sigma/d#theta_{#pi} (cm^{2}/deg./C^{12})");
   fSettings.SetAllowedTypes("FIX,FREE,SHAPE/DIAG,FULL/NORM/MASK", "FIX/FULL");
   fSettings.SetEnuRange(1.5, 20.0);
   fSettings.DefineAllowedTargets("C,H");
   fSettings.DefineAllowedSpecies("numu");
   fSettings.SetTitle("MINERvA_CCCOHPI_XSec_1Dth_nu");
 
   fSettings.SetDataInput( GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/th_nu_XSec.csv");
   fSettings.SetCovarInput(GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/th_nu_Covar_stat.csv;" +
 			  GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/th_nu_Covar_flux.csv;" +
 			  GeneralUtils::GetTopLevelDir() + "/data/MINERvA/CCcoh/th_nu_Covar_sys.csv");
 			   
   FinaliseSampleSettings();
 
   // Scaling Setup ---------------------------------------------------
   // ScaleFactor automatically setup for DiffXSec/cm2/Nucleon
   fScaleFactor = GetEventHistogram()->Integral("width") * double(1E-38) / double(fNEvents)/TotalIntegratedFlux("width")*13;
    
   // Plot Setup -------------------------------------------------------
   SetDataFromTextFile( fSettings.GetDataInput() );
   SetCovarFromMultipleTextFiles(fSettings.GetCovarInput());
 
   // Apply scalings based on the data release
   ScaleData(1E-39);
 
   // Final setup  ---------------------------------------------------
   FinaliseMeasurement();
 
 };
 
 
 void MINERvA_CCCOHPI_XSec_1Dth_nu::FillEventVariables(FitEvent *event) {
 
   if (event->NumFSParticle(211) == 0) return;
 
   TLorentzVector Pnu = event->GetNeutrinoIn()->fP;
   TLorentzVector Ppi = event->GetHMFSParticle(211)->fP;
   fXVar = (180. / M_PI) * FitUtils::th(Pnu, Ppi);
 
   return;
 };
 
 //********************************************************************
 bool MINERvA_CCCOHPI_XSec_1Dth_nu::isSignal(FitEvent *event) {
 //********************************************************************
   // Signal: numu + 12C --> mu- + pi+ + 12C'
   return SignalDef::isCCCOH(event, 14, 211, EnuMin, EnuMax);
 }
 
 
 double MINERvA_CCCOHPI_XSec_1Dth_nu::GetLikelihood(){
   double chi2 = StatUtils::GetChi2FromCov(this->fDataHist, this->fMCHist, this->covar, NULL, 1E39, 10);
   return chi2;
 }