diff --git a/src/MCStudies/SigmaEnuHists.cxx b/src/MCStudies/SigmaEnuHists.cxx
index 5d5064f..514ed94 100644
--- a/src/MCStudies/SigmaEnuHists.cxx
+++ b/src/MCStudies/SigmaEnuHists.cxx
@@ -1,184 +1,188 @@
// 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 "SigmaEnuHists.h"
SigmaEnuHists::SigmaEnuHists(std::string name, std::string inputfile,
FitWeight *rw, std::string type,
std::string fakeDataFile) {
// Measurement Details
fName = name;
// Define our energy range for flux calcs
EnuMin = 0.;
EnuMax = 1E10; // Arbritrarily high energy limit
// This function will sort out the input files automatically and parse all the
// inputs,flags,etc.
// There may be complex cases where you have to do this by hand, but usually
// this will do.
Measurement1D::SetupMeasurement(inputfile, type, rw, fakeDataFile);
// Setup fDataHist as a placeholder
fDataHist = new TH1D(("empty_data"), ("empty-data"), 1, 0, 1);
SetupDefaultHist();
// 1. The generator is organised in SetupMeasurement so it gives the
// cross-section in "per nucleon" units.
// So some extra scaling for a specific measurement may be required. For
// Example to get a "per neutron" measurement on carbon
// which we do here, we have to multiple by the number of nucleons 12 and
// divide by the number of neutrons 6.
// N.B. MeasurementBase::PredictedEventRate includes the 1E-38 factor that is
// often included here in other classes that directly integrate the event
// histogram. This method is used here as it now respects EnuMin and EnuMax
// correctly.
fScaleFactor =
GetEventHistogram()->Integral("width") * double(1E-38) / double(fNEvents);
NUIS_LOG(SAM, " Generic Flux Scaling Factor = "
<< fScaleFactor << " [= "
<< (GetEventHistogram()->Integral("width") * 1E-38) << "/("
<< (fNEvents + 0.) << "*" << TotalIntegratedFlux("width")
<< ")]");
if (fScaleFactor <= 0.0) {
NUIS_ABORT("SCALE FACTOR TOO LOW");
}
TopologyNames[kCC] = "CCInc";
TopologyNames[kCC0Pi] = "CC0Pi";
TopologyNames[kCC1Pi] = "CC1Pi";
TopologyNames[kCC1Pip] = "CC1Pip";
TopologyNames[kCC1Pi0] = "CC1Pi0";
TopologyNames[kCC1Pim] = "CC1Pim";
TopologyNames[kCCNPi] = "CCNPi";
TopologyNames[kNC] = "NCInc";
TopologyNames[kNC0Pi] = "NC0Pi";
TopologyNames[kNC1Pi] = "NC1Pi";
TopologyNames[kNCNPi] = "NCNPi";
for (int t = kCC; t < kNTopologies; ++t) {
TopologyHists[t] =
static_cast(fFluxHist->Clone(TopologyNames[t].c_str()));
TopologyHists[t]->SetTitle(
";#it{E}_{#nu} (GeV); #sigma(#it{E_{#nu}}) 10^{-38} cm^{2} /nucleon");
TopologyHists[t]->Reset();
}
+
+ NEUTModeHists[0] = static_cast(fFluxHist->Clone("TotalXSec"));
+ NEUTModeHists[0]->SetTitle(
+ ";#it{E}_{#nu} (GeV); #sigma(#it{E_{#nu}}) 10^{-38} cm^{2} /nucleon");
+ NEUTModeHists[0]->Reset();
}
void SigmaEnuHists::FillEventVariables(FitEvent *event) {
- double hw = 1; // fScaleFactor;
-
// Now fill the information
if (!NEUTModeHists.count(event->Mode)) {
std::stringstream ss;
ss << "NeutMode_" << (event->Mode < 0 ? "m" : "") << abs(event->Mode);
NEUTModeHists[event->Mode] =
static_cast(fFluxHist->Clone(ss.str().c_str()));
NEUTModeHists[event->Mode]->SetTitle(
";#it{E}_{#nu} (GeV); #sigma(#it{E_{#nu}}) 10^{-38} cm^{2} /nucleon");
NEUTModeHists[event->Mode]->Reset();
}
FitParticle *nu = event->GetBeamPart();
- NEUTModeHists[event->Mode]->Fill(nu->fP.E() * 1E-3, hw);
+ NEUTModeHists[event->Mode]->Fill(nu->fP.E() * 1E-3);
+ NEUTModeHists[0]->Fill(nu->fP.E() * 1E-3);
#ifdef __GENIE_ENABLED__
if (event->fType == kGENIE) {
EventRecord *gevent = static_cast(event->genie_event->event);
const Interaction *interaction = gevent->Summary();
int gmode = interaction->ProcInfo().ScatteringTypeId();
int isNC = interaction->ProcInfo().IsWeakCC();
int isnu = nu->fPID > 0;
int nuis_gmode = (gmode + 30 * isNC) * (isnu ? 1 : -1);
if (!GENIEModeHists.count(nuis_gmode)) {
std::stringstream ss;
ss << "GENIEMode_" << (isNC ? "NC_" : "CC_") << (isnu ? "nu_" : "nubar_")
<< interaction->ProcInfo().ScatteringTypeAsString();
GENIEModeHists[nuis_gmode] =
static_cast(fFluxHist->Clone(ss.str().c_str()));
GENIEModeHists[nuis_gmode]->SetTitle(
";#it{E}_{#nu} (GeV); #sigma(#it{E_{#nu}}) 10^{-38} cm^{2} /nucleon");
GENIEModeHists[nuis_gmode]->Reset();
}
- GENIEModeHists[nuis_gmode]->Fill(nu->fP.E() * 1E-3, hw);
+ GENIEModeHists[nuis_gmode]->Fill(nu->fP.E() * 1E-3);
}
#endif
int NPi = event->GetAllFSPionsIndices().size();
int NPip = event->GetAllFSPiPlusIndices().size();
int NPim = event->GetAllFSPiMinusIndices().size();
if (event->IsCC()) {
- TopologyHists[kCC]->Fill(nu->fP.E() * 1E-3, hw);
+ TopologyHists[kCC]->Fill(nu->fP.E() * 1E-3);
if (NPi == 0) {
- TopologyHists[kCC0Pi]->Fill(nu->fP.E() * 1E-3, hw);
+ TopologyHists[kCC0Pi]->Fill(nu->fP.E() * 1E-3);
} else if (NPi == 1) {
- TopologyHists[kCC1Pi]->Fill(nu->fP.E() * 1E-3, hw);
+ TopologyHists[kCC1Pi]->Fill(nu->fP.E() * 1E-3);
if (NPip == 1) {
- TopologyHists[kCC1Pip]->Fill(nu->fP.E() * 1E-3, hw);
+ TopologyHists[kCC1Pip]->Fill(nu->fP.E() * 1E-3);
} else if (NPim == 1) {
- TopologyHists[kCC1Pim]->Fill(nu->fP.E() * 1E-3, hw);
+ TopologyHists[kCC1Pim]->Fill(nu->fP.E() * 1E-3);
} else {
- TopologyHists[kCC1Pi0]->Fill(nu->fP.E() * 1E-3, hw);
+ TopologyHists[kCC1Pi0]->Fill(nu->fP.E() * 1E-3);
}
} else {
- TopologyHists[kCCNPi]->Fill(nu->fP.E() * 1E-3, hw);
+ TopologyHists[kCCNPi]->Fill(nu->fP.E() * 1E-3);
}
} else {
- TopologyHists[kNC]->Fill(nu->fP.E() * 1E-3, hw);
+ TopologyHists[kNC]->Fill(nu->fP.E() * 1E-3);
if (NPi == 0) {
- TopologyHists[kNC0Pi]->Fill(nu->fP.E() * 1E-3, hw);
+ TopologyHists[kNC0Pi]->Fill(nu->fP.E() * 1E-3);
} else if (NPi == 1) {
- TopologyHists[kNC1Pi]->Fill(nu->fP.E() * 1E-3, hw);
+ TopologyHists[kNC1Pi]->Fill(nu->fP.E() * 1E-3);
} else {
- TopologyHists[kNCNPi]->Fill(nu->fP.E() * 1E-3, hw);
+ TopologyHists[kNCNPi]->Fill(nu->fP.E() * 1E-3);
}
}
};
void SigmaEnuHists::Write(std::string drawOpt) {
for (std::map::iterator h = NEUTModeHists.begin();
h != NEUTModeHists.end(); ++h) {
PlotUtils::FluxUnfoldedScaling(h->second, GetFluxHistogram(),
GetEventHistogram(), fScaleFactor, fNEvents);
h->second->Write();
}
for (std::map::iterator h = GENIEModeHists.begin();
h != GENIEModeHists.end(); ++h) {
PlotUtils::FluxUnfoldedScaling(h->second, GetFluxHistogram(),
GetEventHistogram(), fScaleFactor, fNEvents);
h->second->Write();
}
for (std::map::iterator h = TopologyHists.begin();
h != TopologyHists.end(); ++h) {
PlotUtils::FluxUnfoldedScaling(h->second, GetFluxHistogram(),
GetEventHistogram(), fScaleFactor, fNEvents);
h->second->Write();
}
}
// Override functions which aren't really necessary
bool SigmaEnuHists::isSignal(FitEvent *event) {
(void)event;
return true;
};