diff --git a/src/ANL/ANL_CC1pi0_Evt_1DWNmu_nu.cxx b/src/ANL/ANL_CC1pi0_Evt_1DWNmu_nu.cxx
index a4d75fa..1b1c968 100644
--- a/src/ANL/ANL_CC1pi0_Evt_1DWNmu_nu.cxx
+++ b/src/ANL/ANL_CC1pi0_Evt_1DWNmu_nu.cxx
@@ -1,83 +1,83 @@
// 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 .
*******************************************************************************/
#include "ANL_CC1pi0_Evt_1DWNmu_nu.h"
//********************************************************************
ANL_CC1pi0_Evt_1DWNmu_nu::ANL_CC1pi0_Evt_1DWNmu_nu(nuiskey samplekey) {
//********************************************************************
// Sample overview ---------------------------------------------------
std::string descrip = "ANL CC1pi0 Event Rate 1D W(N mu) nu sample. \n" \
"Target: D2 \n" \
"Flux: \n" \
"Signal: \n";
// Setup common settings
fSettings = LoadSampleSettings(samplekey);
fSettings.SetDescription(descrip);
fSettings.SetTitle("ANL #nu_mu CC1p#pi^{0}");
fSettings.SetXTitle("W(N#mu) (GeV)");
fSettings.SetYTitle("Number of events");
fSettings.SetAllowedTypes("EVT/SHAPE/DIAG","EVT/SHAPE/DIAG");
fSettings.DefineAllowedTargets("D,H");
fSettings.DefineAllowedSpecies("numu");
fSettings.SetEnuRange(0.0, 10);
fSettings.SetDataInput( FitPar::GetDataBase() + "/ANL/CC1pi0_on_n/ANL_CC1pi0_WNmu_per_0.04GeV.txt" );
FinaliseSampleSettings();
// Scaling Setup ---------------------------------------------------
// ScaleFactor automatically setup for DiffXSec/cm2/Nucleon
fScaleFactor = GetEventHistogram()->Integral("width") / (fNEvents + 0.) * 2. / 1.;
// Plot Setup -------------------------------------------------------
SetDataFromTextFile( fSettings.GetDataInput() );
SetPoissonErrors();
SetCovarFromDiagonal();
// Final setup ---------------------------------------------------
FinaliseMeasurement();
};
void ANL_CC1pi0_Evt_1DWNmu_nu::FillEventVariables(FitEvent *event) {
if (event->NumFSParticle(2212) == 0 ||
event->NumFSParticle(111) == 0 ||
event->NumFSParticle(13) == 0)
return;
TLorentzVector Pmu = event->GetHMFSParticle(13)->fP;
- TLorentzVector Ppip = event->GetHMFSParticle(111)->fP;
+ TLorentzVector Pp = event->GetHMFSParticle(2212)->fP;
- double hadMass = (Pmu+Ppip).Mag()/1000.;
+ double hadMass = (Pmu+Pp).Mag()/1000.;
fXVar = hadMass;
return;
};
bool ANL_CC1pi0_Evt_1DWNmu_nu::isSignal(FitEvent *event) {
return SignalDef::isCC1pi3Prong(event, 14, 111, 2212, EnuMin, EnuMax);
}
diff --git a/src/ANL/ANL_CC1ppip_Evt_1DWNmu_nu.cxx b/src/ANL/ANL_CC1ppip_Evt_1DWNmu_nu.cxx
index 949db0e..1a51a1b 100644
--- a/src/ANL/ANL_CC1ppip_Evt_1DWNmu_nu.cxx
+++ b/src/ANL/ANL_CC1ppip_Evt_1DWNmu_nu.cxx
@@ -1,83 +1,83 @@
// 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 .
*******************************************************************************/
#include "ANL_CC1ppip_Evt_1DWNmu_nu.h"
//********************************************************************
ANL_CC1ppip_Evt_1DWNmu_nu::ANL_CC1ppip_Evt_1DWNmu_nu(nuiskey samplekey) {
//********************************************************************
// Sample overview ---------------------------------------------------
std::string descrip = "ANL CC1ppip Event Rate 1D W(N mu) nu sample. \n" \
"Target: D2 \n" \
"Flux: \n" \
"Signal: \n";
// Setup common settings
fSettings = LoadSampleSettings(samplekey);
fSettings.SetDescription(descrip);
fSettings.SetTitle("ANL #nu_mu CC1p#pi^{+}");
fSettings.SetXTitle("W(N#mu) (GeV)");
fSettings.SetYTitle("Number of events");
fSettings.SetAllowedTypes("EVT/SHAPE/DIAG","EVT/SHAPE/DIAG");
fSettings.DefineAllowedTargets("D,H");
fSettings.DefineAllowedSpecies("numu");
fSettings.SetEnuRange(0.0, 10);
fSettings.SetDataInput( FitPar::GetDataBase() + "/ANL/CC1pip_on_p/ANL_CC1ppip_WNmu_per_0.04GeV.txt" );
FinaliseSampleSettings();
// Scaling Setup ---------------------------------------------------
// ScaleFactor automatically setup for DiffXSec/cm2/Nucleon
fScaleFactor = GetEventHistogram()->Integral("width") / (fNEvents + 0.) * 2. / 1.;
// Plot Setup -------------------------------------------------------
SetDataFromTextFile( fSettings.GetDataInput() );
SetPoissonErrors();
SetCovarFromDiagonal();
// Final setup ---------------------------------------------------
FinaliseMeasurement();
};
void ANL_CC1ppip_Evt_1DWNmu_nu::FillEventVariables(FitEvent *event) {
if (event->NumFSParticle(2212) == 0 ||
event->NumFSParticle(211) == 0 ||
event->NumFSParticle(13) == 0)
return;
TLorentzVector Pmu = event->GetHMFSParticle(13)->fP;
- TLorentzVector Ppip = event->GetHMFSParticle(211)->fP;
+ TLorentzVector Pp = event->GetHMFSParticle(2212)->fP;
- double hadMass = (Pmu+Ppip).Mag()/1000.;
+ double hadMass = (Pmu+Pp).Mag()/1000.;
fXVar = hadMass;
return;
};
bool ANL_CC1ppip_Evt_1DWNmu_nu::isSignal(FitEvent *event) {
return SignalDef::isCC1pi3Prong(event, 14, 211, 2212, EnuMin, EnuMax);
}