Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

minor edits to new bindings #122

Merged
merged 55 commits into from
Nov 25, 2024
Merged

minor edits to new bindings #122

Show file tree
Hide file tree
Changes from 54 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
f2a78b7
Merge pull request #1 from KATRIN-Experiment/master
nsoblath Mar 11, 2016
ef1e19b
Cherry pick: Minor changes to build system to allow building as a sub…
Mar 10, 2016
fea57ea
CMake policy fixes
Mar 11, 2016
30dcbb1
A few more cmake changes
Mar 11, 2016
6a1f644
Merge branch 'feature/kassfixes' into develop
Mar 11, 2016
7b9d0a1
Allow the KVariableProcessor variable map to be set after construction
Mar 14, 2016
4db786c
Added KSEventModifier, and KSRootEventModifier, and implement use by …
Mar 14, 2016
b0b4fd6
Added KSRootEventModifierBuilder
Mar 28, 2016
aa86f4c
Added temporary pthreads to KSRoot.cxx for purpose of generating sign…
pslocum Apr 5, 2016
a078fe6
Added pre and post event conditions for triggering events in Kassiope…
pslocum Apr 25, 2016
99dbab5
Moved post-KSStep code for Locust_mc out of KSRoot.cxx and into Cyclo…
pslocum May 11, 2016
1b0ff23
Reset digitizer t_old in KSRoot::ReceivedEventStartCondition at the s…
pslocum May 12, 2016
22ca12f
Tuned thread signals for faster Locust-Kassiopeia.
pslocum May 19, 2016
606e990
Tweaked timing of thread signals to interface with Locust.
pslocum Jun 20, 2016
dcf4956
Commented out step_msg updates in KSRoot.cxx. Moved print statement …
Jul 19, 2016
821caba
Adjusted thread signals to accomodate isotropic Kr spectrum with low …
Oct 7, 2016
0b27181
Removed unnecessary fKassReadycondition.notify_one() from KSRoot::Wak…
Oct 8, 2016
7e0a0ca
Tuned final thread stop signal in KSRoot.cxx
Oct 13, 2016
9e0c131
Removed initialization and finalization of derivative calculations in…
pslocum Dec 27, 2016
c08dbdb
Routine update
Jan 5, 2017
38533ef
Merge pull request #4 from KATRIN-Experiment/master
pslocum Jun 16, 2017
c08c2f3
Merge branch 'master' into feature/eventmod
pslocum Jun 16, 2017
ae0e94e
Merge pull request #5 from project8/feature/eventmod
pslocum Jun 16, 2017
3bc2725
Revert "Feature/eventmod"
pslocum Jun 16, 2017
6660bd5
Merge pull request #6 from project8/revert-5-feature/eventmod
pslocum Jun 16, 2017
f327337
Merge pull request #8 from KATRIN-Experiment/master
pslocum Oct 21, 2018
723d37a
Merge pull request #11 from KATRIN-Experiment/master
pslocum Feb 21, 2019
94544df
Check for Boost library as variable or imported target
nsoblath May 1, 2020
92014ed
Merge pull request #12 from project8/feature/boostlibfix
pslocum May 2, 2020
bc26686
Merge pull request #13 from KATRIN-Experiment/master
pslocum May 4, 2020
588ef5f
Merge pull request #14 from KATRIN-Experiment/master
pslocum May 8, 2020
91acc4c
Merge pull request #15 from KATRIN-Experiment/master
nsoblath Jun 23, 2020
c13e0f0
Merge pull request #16 from KATRIN-Experiment/master
pslocum Jul 17, 2020
27f13f1
Merge pull request #17 from KATRIN-Experiment/master
pslocum Jul 22, 2020
c09f4d6
Merge pull request #18 from KATRIN-Experiment/master
pslocum Jul 25, 2020
c809f34
Merge pull request #19 from KATRIN-Experiment/master
pslocum Mar 17, 2021
0354497
Commented out find_package() lines for Boost and Root in CMakeLists.txt
pslocum Apr 13, 2021
ab11297
Update CMakeLists.txt to v3.8.0 for purpose of merge test.
pslocum Aug 31, 2021
4792469
Merge pull request #20 from KATRIN-Experiment/main
pslocum Aug 31, 2021
1829313
Comment out find_package ROOT. Now it builds on Ubuntu laptop.
pslocum Sep 14, 2021
8f70bde
Reinstate find_package(ROOT). Standalone Kass configures on Ubuntu l…
pslocum Sep 17, 2021
e1ce604
Uncomment more lines for finding ROOT > v6.16 .
pslocum Sep 20, 2021
4b81b7c
Comment out Applications/Validation subdirectory to allow build with …
pslocum Oct 1, 2021
d83902a
Uncomment add_submodule(Applications/Validation) which relies on vtk.…
pslocum Oct 18, 2021
81e0fac
Merge pull request #21 from project8/feature/v3.8.0
pslocum Dec 20, 2022
1ffb134
Merge pull request #22 from KATRIN-Experiment/main
pslocum Dec 20, 2022
11b9f39
Merge branch 'KATRIN-Experiment:main' into master
pslocum Jul 31, 2023
1c0bdf3
Merge branch 'KATRIN-Experiment:main' into master
pslocum Sep 21, 2023
be68071
Merge pull request #25 from KATRIN-Experiment/main
pslocum Dec 19, 2023
73c6159
Merge pull request #27 from KATRIN-Experiment/main
pslocum Apr 24, 2024
bf39b45
Merge branch 'KATRIN-Experiment:main' into master
pslocum Oct 1, 2024
57986b2
Merge branch 'KATRIN-Experiment:main' into master
pslocum Oct 15, 2024
d6b61e2
Merge branch 'KATRIN-Experiment:main' into master
pslocum Oct 16, 2024
07fa6a9
Minor edits to bindings.
pslocum Nov 19, 2024
da38ee7
Update Kassiopeia/Bindings/Interactions/Source/KSIntCalculatorMottBui…
pslocum Nov 24, 2024
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: 1 addition & 1 deletion Kassiopeia/Bindings/Interactions/Source/KSIntCalculatorMottBuilder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ STATICINT sKSIntCalculatorMottStructure = KSIntCalculatorMottBuilder::Attribute<
KSIntCalculatorMottBuilder::Attribute<std::string>("nucleus");

STATICINT sToolboxKSIntCalculatorMott =
KSRootBuilder::ComplexElement<KSIntCalculatorMott>("ksint_calculator_mott");
KSRootBuilder::ComplexElement<KSIntCalculatorMott>("calculator_mott");
pslocum marked this conversation as resolved.
Show resolved Hide resolved
} // namespace katrin
4 changes: 3 additions & 1 deletion Kassiopeia/Bindings/Interactions/Source/KSIntScatteringBuilder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "KSIntCalculatorHydrogenBuilder.h"
#include "KSIntCalculatorIonBuilder.h"
#include "KSIntCalculatorKESSBuilder.h"
#include "KSIntCalculatorMottBuilder.h"
#include "KSIntDensityConstantBuilder.h"
#include "KSRootBuilder.h"

Expand Down Expand Up @@ -32,5 +33,6 @@ STATICINT sKSIntScatteringStructure =
KSIntScatteringBuilder::ComplexElement<KSIntCalculatorHydrogenSet>("calculator_hydrogen") +
KSIntScatteringBuilder::ComplexElement<KSIntCalculatorIon>("calculator_ion") +
KSIntScatteringBuilder::ComplexElement<KSIntCalculatorArgonSet>("calculator_argon") +
KSIntScatteringBuilder::ComplexElement<KSIntCalculatorKESSSet>("calculator_kess");
KSIntScatteringBuilder::ComplexElement<KSIntCalculatorKESSSet>("calculator_kess") +
KSIntScatteringBuilder::ComplexElement<KSIntCalculatorMott>("calculator_mott");
} // namespace katrin
Loading