From f17fecd718ebc800cf5ce9358fb1e312e40ab06d Mon Sep 17 00:00:00 2001 From: Maria Martinez Casales Date: Mon, 18 Dec 2023 12:23:37 -0600 Subject: [PATCH] Bypassing OscillatableSpectrum at compilation time to focus on debugging SpectrumLoader(Base) --- CAFAna/Core/CMakeLists.txt | 10 +++++----- CAFAna/Core/OscillatableSpectrum.cxx | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CAFAna/Core/CMakeLists.txt b/CAFAna/Core/CMakeLists.txt index 85976ed4..6cf1429f 100644 --- a/CAFAna/Core/CMakeLists.txt +++ b/CAFAna/Core/CMakeLists.txt @@ -6,13 +6,13 @@ set(Core_implementation_files Loaders.cxx LoadFromFile.cxx OscCurve.cxx - OscillatableSpectrum.cxx +# OscillatableSpectrum.cxx ProfilerSupport.cxx - Registry.cxx +# Registry.cxx SpectrumLoader.cxx SpectrumLoaderBase.cxx StanUtils.cxx - SystShifts.cxx +# SystShifts.cxx Utilities.cxx ) @@ -32,12 +32,12 @@ set(Core_header_files MultiVar.h OscCalcFwdDeclare.h OscCurve.h - OscillatableSpectrum.h +# OscillatableSpectrum.h SpectrumLoader.h SpectrumLoaderBase.h StanTypedefs.h StanUtils.h - SystShifts.h +# SystShifts.h Utilities.h Var.h Weight.h diff --git a/CAFAna/Core/OscillatableSpectrum.cxx b/CAFAna/Core/OscillatableSpectrum.cxx index cde2fb9b..4f33dd3b 100644 --- a/CAFAna/Core/OscillatableSpectrum.cxx +++ b/CAFAna/Core/OscillatableSpectrum.cxx @@ -7,6 +7,7 @@ #include "CAFAna/Core/Utilities.h" #include "duneanaobj/StandardRecord/Proxy/SRProxy.h" +#include "duneanaobj/StandardRecord/SRInteraction.h" #include "OscLib/IOscCalc.h" #include "TDirectory.h" @@ -21,12 +22,13 @@ namespace ana { namespace{ // Duplicate here because we can't include Vars.h + // These should be true informations, but I think we only have recoparticle atm const Var kTrueE([](const caf::SRInteractionProxy* ixn) { //assert(sr->mc.nnu == 1); assert(ixn->truth.size()>0); /// uuumm what do we - return ixn->Enu; + return ixn->Enu.calo; }); const Cut kHasNu([](const caf::SRInteractionProxy* ixn) {