Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
173 commits
Select commit Hold shift + click to select a range
cd33835
Moving to cafancore v02, with the RecordSource spectrum loading infra…
cjbacchus Jul 29, 2022
9cd6e81
Updating root and duneanaobj versions
mcasales Oct 19, 2023
99c58c4
Temporarily ignoring PRISM and script dirs, too many dependencies on …
mcasales Oct 19, 2023
4145c39
Skip PRISM stuff
mcasales Oct 19, 2023
29756ba
we dont need this for 2x2 files
mcasales Oct 19, 2023
dcf58a9
Examples that work for 2x2 cafs
mcasales Nov 2, 2023
a80bc1f
Commenting out anything that interferes with the StandardRecord struc…
mcasales Nov 2, 2023
6a38741
The goal is to make this test macro work
mcasales Dec 8, 2023
1175dc3
Adding comments to test macro goal
mcasales Dec 8, 2023
e9b97b6
Fixing conficlts with branch feature/mcasales_CAFAna_2x2
mcasales Dec 13, 2023
9d19d46
First attempt to adapt SpectrumLoader and friends to the source/sink …
mcasales Dec 13, 2023
0236c2b
Remove unnecesary comments
mcasales Dec 13, 2023
27dd20f
I forgot to direct HandleFile to the rec tree
mcasales Dec 13, 2023
bdb5bf5
Update SpectrumLoaderBase.cxx
mcasales Dec 13, 2023
dc38d14
I think I misunderstood how the POT was accounted. We keep that in Sp…
mcasales Dec 13, 2023
fd98afb
remove examples that correspond to the feature/mcasales_CAFAna_2x2 br…
mcasales Dec 13, 2023
3f702ed
ignore everything but Core directory for the moment
mcasales Dec 13, 2023
9f0b08f
Add new header
mcasales Dec 13, 2023
88921ef
Fix typos
mcasales Dec 13, 2023
b88ed54
Implementing Loaders SBN-style
mcasales Dec 14, 2023
490285a
Fixing typos
mcasales Dec 14, 2023
10c4aad
Adding definitions for cuts and vars at SR and Interaction, RecoParti…
mcasales Dec 14, 2023
f17fecd
Bypassing OscillatableSpectrum at compilation time to focus on debugg…
mcasales Dec 18, 2023
d11b2de
Fixing more typos
mcasales Dec 18, 2023
df7b88b
only compile Core while debugging SpectrumLoader
mcasales Dec 18, 2023
5e10057
Uncomment some things we dont need to skip
mcasales Dec 18, 2023
bdaecd3
Added missing includes of IRecord(Source,Sink)
mcasales Dec 18, 2023
c7c0207
I missed IRecordSource.cxx in the list
mcasales Dec 19, 2023
27bb316
Correcting more headers and typos in VectorAdapter
mcasales Dec 19, 2023
9380edb
Trying to implement an argument to select reconstruction type RecoTyp…
mcasales Jan 8, 2024
5347d43
Ignore some libraries for the moment
mcasales Jan 8, 2024
b184de5
sketch of one path towards loader.Interactions(kPandora) etc.
chenel Jan 11, 2024
74017cc
Attempting to compile
mcasales Jan 12, 2024
98a1d9e
initialize the collection in a dedicated constructor instead of initi…
chenel Jan 12, 2024
e9e75b3
Merge remote-tracking branch 'dune-github/feature/source-sink-overhau…
chenel Jan 12, 2024
b41bd4e
Duplicating for Interactions
mcasales Jan 12, 2024
a4f3490
I forgot to declare _IRecordSource
mcasales Jan 12, 2024
ade722c
In the meantime leave a DLP source for the operator
mcasales Jan 12, 2024
e937155
static assertions were failing when compiling, commenting them out al…
mcasales Jan 12, 2024
d08503d
Im not sure this is the way to use assert here, but this compiles
mcasales Jan 13, 2024
b6187b3
Updating example macro with the latest
mcasales Jan 13, 2024
5fa9f34
Simplifying demo0b and adding a more stuff to the new demo1b
mcasales Jan 13, 2024
cfcce55
Adding TrueInteraction adapters
mcasales Jan 18, 2024
e3a5e07
Updating examples and readme
mcasales Jan 18, 2024
eea4b04
Adding Interaction ensemble
mcasales Feb 16, 2024
124980c
Introduce Multiverse class, necessary for EnsembleRecord source sink …
mcasales Feb 16, 2024
687b939
Adding Multiverse and FitMultiverse
mcasales Feb 16, 2024
6090a84
Corrected order of headers
mcasales Feb 26, 2024
b9622ba
Changes to multiverse on Interaction rather than SR
mcasales Feb 26, 2024
21a9d8b
Change ISyst to InteractionProxy rather than std record
mcasales Feb 26, 2024
6759448
fix header
mcasales Feb 26, 2024
39b8e23
Add Multiverse
mcasales Feb 26, 2024
529a7d4
Add randomThrows and shift in interaction rather than standard record
mcasales Feb 26, 2024
112c099
Pointing out where GetUniverse is not working
mcasales Feb 26, 2024
a72093b
Return to original line 41
mcasales Feb 29, 2024
566b82b
Added Ensemble version that returns particles
mcasales Feb 29, 2024
b7b724f
Fix header
mcasales Feb 29, 2024
a83d540
Added unordered_map constructor
mcasales Feb 29, 2024
7a9264a
Fix headers
mcasales Feb 29, 2024
a3b6a0f
new example for ensemble spectra will be here
mcasales Feb 29, 2024
e4f0f7e
Adding SR and Interaction level weights:
mcasales Mar 4, 2024
3af2da7
Introducing EnsembleSpectrum and friends, directly from sbnana CAFAna
mcasales Mar 4, 2024
0e0d88a
ignore ._* files
mcasales Mar 4, 2024
56a612a
Add missing headers
mcasales Mar 4, 2024
4a9cc5a
Uncommenting copy constructor, I dont understand errors regarding this
mcasales Mar 4, 2024
9e20f9b
Add utility functions needed for EnsembleSpectrum and friends
mcasales Mar 4, 2024
3619d89
Add EnsembleSpectrum and friends. This commit compiles, yay
mcasales Mar 4, 2024
d99535a
Sketch of test macro for EnsembleSpectrum
mcasales Mar 4, 2024
80eee34
Add override POT option
mcasales Mar 7, 2024
c0e9522
A somwehat working version of ensemble spectrum that draws error band…
mcasales Mar 7, 2024
dd66f8f
adding true 1-sigma error band to compare
mcasales Mar 7, 2024
ac99c69
Updating tutorials
mcasales Mar 20, 2024
42be02d
Updating things to include reading true particles branch
mcasales Apr 20, 2024
3d0b5d8
Updating dir of files
mcasales Apr 20, 2024
5c2bbdd
update duneanaobj
sindhu-ku Apr 22, 2024
7570fab
add setup to use files in pnfs
sindhu-ku Apr 22, 2024
4796759
2x2 mesonless analysis
sindhu-ku Apr 22, 2024
e105590
Merge branch 'feature/source-sink-overhaul' of https://github.com//si…
sindhu-ku Apr 22, 2024
22477a9
add true particle dists
sindhu-ku Apr 22, 2024
34bebcf
change energy range
sindhu-ku Apr 23, 2024
733fc5b
Adding commented out lines of my attempt at making Ensemble implement…
mcasales Apr 23, 2024
6c58a2b
Updating demos to latest files
mcasales Apr 23, 2024
0381670
I was missing a line
mcasales Apr 23, 2024
bbb026e
edit selection
sindhu-ku Apr 23, 2024
38698d4
update selection
sindhu-ku Apr 24, 2024
0ea26b3
update selection
sindhu-ku Apr 25, 2024
eb252b5
Fixing a small typo
mcasales Apr 25, 2024
7940b03
updated duneanaobj version
mcasales Apr 25, 2024
c2e41e2
Update README.md
mcasales Apr 25, 2024
4aaf436
fixed a typo in setting root
mcasales Aug 8, 2024
fc1cb98
Adding BOOST include to cafe
mcasales Aug 8, 2024
b0ab281
make it easier to specify build & install dirs
chenel Aug 8, 2024
20d2409
Adding container instruction
mcasales Aug 8, 2024
c8b276a
Closer to the tutorial version, with new files and prettier plots
mcasales Aug 9, 2024
1387a38
Making sure flatcafs read the right pot
mcasales Aug 20, 2024
c37e105
Adding a function to merge several spectra into an ensemble
mcasales Aug 20, 2024
a79df73
removing ups products that will be replaced by jwolcott versions
mcasales Aug 20, 2024
68564e5
adding an example with file systematics
mcasales Aug 20, 2024
a1139e6
adding instruction about setting the ups directory from Jeremy
mcasales Aug 20, 2024
34cfc11
Adding more examples with true-reco matching
mcasales Aug 20, 2024
85e5d7a
Adding notes of to dos
mcasales Sep 2, 2024
c7fa966
Adding a member that merges several EnsembleSpectrum into a single one
mcasales Sep 2, 2024
6d9acf7
Fixing comments and indentations
mcasales Sep 4, 2024
1c5b10e
Adding a function to get th2 from eigenmx
mcasales Sep 4, 2024
29a00bd
Pushing a bunch of updates in examples
mcasales Sep 4, 2024
bc0db40
Update README.md
mcasales Sep 4, 2024
4e446df
Merge branch 'feature/source-sink-overhaul' of github.com:DUNE/lblpwg…
mcasales Sep 4, 2024
71cae01
more details in instructions
mcasales Sep 4, 2024
4eec285
Changed duneanaobj version to add FindInteraction function
mcasales Sep 5, 2024
b5cfed3
small change in verifying universe size
mcasales Sep 5, 2024
6395c98
cleaning up tutorials
mcasales Sep 5, 2024
b7c4525
Merge branch 'feature/source-sink-overhaul' into feature/source-sink-…
sindhu-ku Sep 5, 2024
d774e61
Revert "Merge branch 'feature/source-sink-overhaul' into feature/sour…
sindhu-ku Sep 5, 2024
2f6e7e4
use preprocessor defines to hide code until we can fix it
chenel Sep 14, 2024
ce66410
support passing extra CMake args (primarily compiler defines)
chenel Sep 14, 2024
027ef6c
whoops, missed an uncomment
chenel Sep 14, 2024
a6566e4
hide some Stan bits behind a #define
chenel Sep 14, 2024
4f77e8e
explicitly include Boost
chenel Sep 14, 2024
be836cc
need the `constexpr` in `else if` clauses too
chenel Sep 14, 2024
adb3f35
adapt for modern StandardRecord
chenel Sep 14, 2024
dbc9a15
we now have real xsec and beam systs, so don't need these placeholders
chenel Sep 23, 2024
691bb81
won't be able to load TDR files with this version of CAFAna anyway
chenel Feb 13, 2025
c98697c
restore some stuff that was lost during conversion
chenel Feb 13, 2025
3efcb9f
delete some commented-out stuff that's not relevant any more
chenel Feb 13, 2025
9a4f437
port Cuts to new StandardRecord interface
chenel Feb 13, 2025
a8d972a
remove TDR analysis stuff that has no hope of working any more
chenel Feb 14, 2025
4954a7e
remove TDR-era vars that won't work
chenel Feb 14, 2025
5bf865a
don't build PRISM by default---it needs a lot of work first
chenel Feb 14, 2025
3cf7950
allow for building a Cut fom a TruthCut
chenel Feb 24, 2025
00be209
drop dead code
chenel Feb 24, 2025
a333230
TruthCuts and Cuts
chenel Feb 24, 2025
3dac021
move Predictions to Interaction basis
chenel Feb 24, 2025
1190840
move a first Extrap to Interaction basis
chenel Feb 24, 2025
20dff76
remove obsolete PredictionNuOnE
chenel Feb 24, 2025
6931808
eliminate the old ad-hoc systs that won't work with modern StandardRe…
chenel Feb 25, 2025
dea9101
add helper to match reco interactions to true interactions
chenel Feb 25, 2025
8ac944b
use the truth-matching tools now
chenel Feb 25, 2025
b64c53e
adapt concrete systs to SRInteraction
chenel Feb 25, 2025
302a69a
don't try to build the legacy scripts any more
chenel Feb 25, 2025
68769ba
eliminate legacy FixupRecord
chenel Feb 25, 2025
e946a33
eliminate more dead code
chenel Feb 25, 2025
f9b87a1
disable some more unusable code
chenel Feb 27, 2025
0019d0f
re-enable OscillatableSpectrum
chenel Feb 27, 2025
699dfa1
make CAFAna importable from other CMake applications
chenel Feb 27, 2025
8b3f575
let's invent a version number
chenel Feb 27, 2025
f3687a3
makes me feel a bit dirty, but accommodate missing truth info in FD CAFs
chenel Mar 1, 2025
5e6c18e
more dead code removal
chenel Mar 1, 2025
333e3b2
accommodate FD CAFs' subdirectory storage model
chenel Mar 1, 2025
30ebd07
Generalize Sources<> so that it doesn't have to know what differentia…
chenel Mar 5, 2025
3afb1e2
eliminate more dead code
chenel Mar 5, 2025
2cdbb1f
make "unknown" reco type as a placeholder. hopefully won't regret that
chenel Mar 5, 2025
2f01949
consolidate the two NoExtrapPredGens together
chenel Mar 8, 2025
e9d0555
goodbye dead code
chenel Mar 8, 2025
b4ed04b
provide a bit more help to user when file isn't structured as expected
chenel Mar 8, 2025
4904362
don't put complicated non-template implementations in headers
chenel Mar 8, 2025
a5feaf7
can't use a smart pointer you just moved :facepalm:
chenel Mar 8, 2025
94f2c10
no point forward-declaring when you have it #included
chenel Mar 8, 2025
4b34f1f
a Loaders shouldn't bundle across flux type
chenel Mar 8, 2025
0fd7537
revive the Loaders interface for the known Prediction types
chenel Mar 8, 2025
17fce8a
don't accidentally remove owned sources while trying to register them
chenel Mar 8, 2025
b75a318
user needs to specify reco interactions to use when using Loaders int…
chenel Mar 8, 2025
5187099
split the templated Sources into its own files
chenel Mar 8, 2025
dd3975e
add a SaveTo() specialization for IOscCalcAdjustable to suppress anno…
chenel Mar 8, 2025
9e283cc
make sure CAFAnaAnalysis is including in All target
chenel Mar 8, 2025
5f2591d
don't even open empty files
chenel Mar 17, 2025
2fece39
add missing TruthVarToVar()
chenel Mar 18, 2025
452d9c4
some demo true vertex Vars
chenel Mar 18, 2025
6ffda57
port handy Spectrum group tool from NOvA
chenel Mar 18, 2025
931e88b
Merge remote-tracking branch 'dune-github/feature/source-sink-overhau…
chenel Apr 10, 2025
50d450f
temporary builds of dependent products...
chenel Apr 10, 2025
9f50e24
fix some integer type mismatches, pointer usage, etc.
chenel Apr 10, 2025
ee633de
build SpectrumComponents too
chenel Apr 10, 2025
217f0d7
force new C++11 ABI for std::string etc.
chenel Apr 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CAFAna/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ cmake/CMakeFiles/
*.root
*.pdf
*.png
._*
.DS_*
support/
140 changes: 0 additions & 140 deletions CAFAna/Analysis/AnalysisBinnings.cxx

This file was deleted.

13 changes: 0 additions & 13 deletions CAFAna/Analysis/AnalysisBinnings.h

This file was deleted.

53 changes: 0 additions & 53 deletions CAFAna/Analysis/AnalysisDialGroups.h

This file was deleted.

46 changes: 0 additions & 46 deletions CAFAna/Analysis/AnalysisVars.cxx

This file was deleted.

41 changes: 0 additions & 41 deletions CAFAna/Analysis/AnalysisVars.h

This file was deleted.

20 changes: 0 additions & 20 deletions CAFAna/Analysis/AnalysisVersion.h

This file was deleted.

21 changes: 9 additions & 12 deletions CAFAna/Analysis/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,20 @@ set(Analysis_implementation_files
CalcsNuFit.cxx
Plots.cxx
Resolution.cxx
TDRLoaders.cxx
AnalysisBinnings.cxx
AnalysisVars.cxx
common_fit_definitions.cxx)
SpectrumComponents.cxx
)

set(Analysis_header_files
Calcs.h
CalcsNuFit.h
Plots.h
Resolution.h
TDRLoaders.h
Exposures.h
Style.h
AnalysisBinnings.h
AnalysisDialGroups.h
AnalysisVars.h
common_fit_definitions.h
AnalysisVersion.h
ExtraHeaders.h
CheckPointHelper.h)
CheckPointHelper.h
SpectrumComponents.h
)

add_library(CAFAnaAnalysis SHARED ${Analysis_implementation_files})
target_link_libraries(CAFAnaAnalysis CAFAnaCore CAFAnaFit)
Expand All @@ -34,6 +28,9 @@ if(DEFINED USE_OPENMP AND USE_OPENMP)
target_compile_options(CAFAnaAnalysis BEFORE PUBLIC -DUSE_PREDINTERP_OMP -fopenmp)
endif()

install(TARGETS CAFAnaAnalysis
install(TARGETS CAFAnaAnalysis
EXPORT CAFAnaTargets
LIBRARY DESTINATION lib/
PUBLIC_HEADER DESTINATION include/CAFAna/Analysis/)

add_cafana_lib(CAFAnaAnalysis)
Loading