Fixed Q2 CCQE correction loading. Updated BNL Enu using slightly more robust cross-section extraction from digitized enu plot.

patrickstowell · patrickstowell · commit ec8a7444ecc3 · 2017-10-03T21:41:08.000+01:00
diff --git a/data/BNL/BNL_Data_PRD23_2499.root b/data/BNL/BNL_Data_PRD23_2499.root
diff --git a/src/ANL/ANL_CCQE_Evt_1DQ2_nu.cxx b/src/ANL/ANL_CCQE_Evt_1DQ2_nu.cxx
@@ -62,7 +62,7 @@ ANL_CCQE_Evt_1DQ2_nu::ANL_CCQE_Evt_1DQ2_nu(nuiskey samplekey) {
   applyQ2correction = fSettings.Found("type", "Q2CORR");
   if (applyQ2correction) {
     fSettings.SetS("q2correction_file",  FitPar::GetDataBase() + "/ANL/ANL_CCQE_Data_PRL31_844.root");
-    fSettings.SetS("q2correction_hist", "ANL_XSec_1DQ2_Correction");
+    fSettings.SetS("q2correction_hist", "ANL_1DQ2_Correction");
   }
 
   FinaliseSampleSettings();
diff --git a/src/ANL/ANL_CCQE_XSec_1DEnu_nu.cxx b/src/ANL/ANL_CCQE_XSec_1DEnu_nu.cxx
@@ -55,10 +55,8 @@ ANL_CCQE_XSec_1DEnu_nu::ANL_CCQE_XSec_1DEnu_nu(nuiskey samplekey) {
 
   // is Q2 Correction applied
   applyQ2correction = fSettings.Found("type", "Q2CORR");
-  if (applyQ2correction) {
-    fSettings.SetS("q2correction_file",  FitPar::GetDataBase() + "/ANL/ANL_CCQE_Data_PRL31_844.root");
-    fSettings.SetS("q2correction_hist", "ANL_XSec_1DQ2_Correction");
-  }
+  fSettings.SetS("q2correction_file",  FitPar::GetDataBase() + "/ANL/ANL_CCQE_Data_PRL31_844.root");
+  fSettings.SetS("q2correction_hist", "ANL_1DQ2_Correction");
 
   FinaliseSampleSettings();
 
diff --git a/src/BNL/BNL_CCQE_Evt_1DQ2_nu.cxx b/src/BNL/BNL_CCQE_Evt_1DQ2_nu.cxx
@@ -48,7 +48,7 @@ BNL_CCQE_Evt_1DQ2_nu::BNL_CCQE_Evt_1DQ2_nu(nuiskey samplekey) {
   applyQ2correction = fSettings.Found("type", "Q2CORR");
   if (applyQ2correction) {
     fSettings.SetS("q2correction_file",  FitPar::GetDataBase() + "ANL/ANL_CCQE_Data_PRL31_844.root");
-    fSettings.SetS("q2correction_hist", "ANL_XSec_1DQ2_Correction");
+    fSettings.SetS("q2correction_hist", "ANL_1DQ2_Correction");
   }
 
   FinaliseSampleSettings();
diff --git a/src/BNL/BNL_CCQE_XSec_1DEnu_nu.cxx b/src/BNL/BNL_CCQE_XSec_1DEnu_nu.cxx
@@ -47,7 +47,7 @@ BNL_CCQE_XSec_1DEnu_nu::BNL_CCQE_XSec_1DEnu_nu(nuiskey samplekey) {
   applyQ2correction = fSettings.Found("type", "Q2CORR");
   if (applyQ2correction) {
     fSettings.SetS("q2correction_file",  FitPar::GetDataBase() + "/ANL/ANL_CCQE_Data_PRL31_844.root");
-    fSettings.SetS("q2correction_hist", "ANL_XSec_1DQ2_Correction");
+    fSettings.SetS("q2correction_hist", "ANL_1DQ2_Correction");
   }
 
   FinaliseSampleSettings();

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ ANL_CCQE_Evt_1DQ2_nu::ANL_CCQE_Evt_1DQ2_nu(nuiskey samplekey) {`
`62`	`62`	`applyQ2correction = fSettings.Found("type", "Q2CORR");`
`63`	`63`	`if (applyQ2correction) {`
`64`	`64`	`fSettings.SetS("q2correction_file", FitPar::GetDataBase() + "/ANL/ANL_CCQE_Data_PRL31_844.root");`
`65`		`- fSettings.SetS("q2correction_hist", "ANL_XSec_1DQ2_Correction");`
	`65`	`+ fSettings.SetS("q2correction_hist", "ANL_1DQ2_Correction");`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`FinaliseSampleSettings();`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ BNL_CCQE_Evt_1DQ2_nu::BNL_CCQE_Evt_1DQ2_nu(nuiskey samplekey) {`
`48`	`48`	`applyQ2correction = fSettings.Found("type", "Q2CORR");`
`49`	`49`	`if (applyQ2correction) {`
`50`	`50`	`fSettings.SetS("q2correction_file", FitPar::GetDataBase() + "ANL/ANL_CCQE_Data_PRL31_844.root");`
`51`		`- fSettings.SetS("q2correction_hist", "ANL_XSec_1DQ2_Correction");`
	`51`	`+ fSettings.SetS("q2correction_hist", "ANL_1DQ2_Correction");`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`FinaliseSampleSettings();`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ BNL_CCQE_XSec_1DEnu_nu::BNL_CCQE_XSec_1DEnu_nu(nuiskey samplekey) {`
`47`	`47`	`applyQ2correction = fSettings.Found("type", "Q2CORR");`
`48`	`48`	`if (applyQ2correction) {`
`49`	`49`	`fSettings.SetS("q2correction_file", FitPar::GetDataBase() + "/ANL/ANL_CCQE_Data_PRL31_844.root");`
`50`		`- fSettings.SetS("q2correction_hist", "ANL_XSec_1DQ2_Correction");`
	`50`	`+ fSettings.SetS("q2correction_hist", "ANL_1DQ2_Correction");`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`FinaliseSampleSettings();`