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

Jump to bottom

Feature/marginalise tool #635

Draft
wants to merge 143 commits into
base: main
Choose a base branch
from
Draft

Feature/marginalise tool #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
143 commits
Select commit Hold shift + click to select a range
fef9551
Merge pull request #342 from gundam-organization/main
lgiannes May 26, 2023
d50dc1e
try
lgiannes Aug 30, 2023
02b9a27
Merge branch 'feature/biasTools-1' of https://github.com/nadrino/gund…
lgiannes Aug 30, 2023
1a01d00
added gundamMarginalise first version
lgiannes Sep 28, 2023
cc0425b
CMakeLists.txt modified for manual yaml lib finding
lgiannes Sep 28, 2023
0c2d5f5
create TTree with parameters and LLH, prior, gLLH
lgiannes Oct 2, 2023
465d02d
updated TTree structure
lgiannes Oct 3, 2023
8432aff
added a function in Propagator.cpp to save the weights while paramete…
lgiannes Oct 31, 2023
81e2886
Merged the changes in the main branch onto feature/biasTools-1
lgiannes Oct 31, 2023
ef0c451
moved function throwParametersFromGlobalCovariance(weightschiSquare) …
lgiannes Oct 31, 2023
9f7a080
fixed according to the update of Toolbox::ParallelWorker
lgiannes Oct 31, 2023
05f18a3
added function in generictoolbox.root
lgiannes Nov 2, 2023
510329f
print out swrt(det) of the cov. matrix
lgiannes Nov 10, 2023
14e7fc8
added marginalise flag to Parameter class
lgiannes Nov 10, 2023
4008c6f
submodule generic toolbox
lgiannes Nov 10, 2023
6278fd1
debug parameterSetList
lgiannes Nov 14, 2023
04e483a
check if margConfig is a list
lgiannes Nov 14, 2023
e70f113
check if margConfig is a list
lgiannes Nov 14, 2023
4a8730f
also print gLLH
lgiannes Nov 14, 2023
94f6d5a
minor debug
lgiannes Nov 14, 2023
a04ae72
implementation of profiling result in output TTree
lgiannes Nov 15, 2023
c4ddfa6
less verbose
lgiannes Nov 15, 2023
5d8c592
less verbose
lgiannes Nov 22, 2023
5728fc7
dummy test
lgiannes Dec 11, 2023
b2a09d9
debug: print "dial response is out"
lgiannes Dec 11, 2023
a686686
also print out difference
lgiannes Dec 11, 2023
cf7bace
always print our dial responses
lgiannes Dec 11, 2023
8391e41
inject problematic parvector
lgiannes Dec 11, 2023
bc58bfc
file to inject parameters
lgiannes Dec 11, 2023
9efeee7
uncommented throw params from global covariance
lgiannes Dec 11, 2023
41184c8
debugged parameter injector
lgiannes Dec 11, 2023
08d0b73
debugged parameter injector
lgiannes Dec 11, 2023
1eec9f0
debugged parameter injector
lgiannes Dec 11, 2023
c33a2a6
debugged parameter injector
lgiannes Dec 11, 2023
bc793d5
debugged parameter injector
lgiannes Dec 11, 2023
36361f2
debugged parameter injector
lgiannes Dec 11, 2023
b81a156
debugged parameter injector
lgiannes Dec 11, 2023
301e6b0
bug fix
lgiannes Dec 11, 2023
b378009
bug fix
lgiannes Dec 11, 2023
a4c6645
debug. RUN WITH MAX 10 TOYS!!
lgiannes Dec 12, 2023
3bcc2ae
debug. RUN WITH MAX 10 TOYS!!
lgiannes Dec 12, 2023
f4c0dff
debug. RUN WITH MAX 10 TOYS!!
lgiannes Dec 12, 2023
11cf3f7
debug. RUN WITH MAX 10 TOYS!!
lgiannes Dec 12, 2023
0ab3fc4
debug. RUN WITH MAX 10 TOYS!!
lgiannes Dec 12, 2023
a9bc60d
debug. RUN WITH MAX 10 TOYS!!
lgiannes Dec 12, 2023
c47c4ba
debug (getEffectiveParameterList). RUN WITH MAX 10 TOYS!!
lgiannes Dec 12, 2023
5ae550d
debug (getEffectiveParameterList). RUN WITH MAX 10 TOYS!!
lgiannes Dec 12, 2023
5bc2ccd
debug (getEffectiveParameterList). RUN WITH MAX 10 TOYS!!
lgiannes Dec 12, 2023
f7b38ca
debug (getEffectiveParameterList). RUN WITH MAX 10 TOYS!!
lgiannes Dec 12, 2023
1fc80c4
debug (getEffectiveParameterList). RUN WITH MAX 10 TOYS!!
lgiannes Dec 12, 2023
d010a62
debug (getEffectiveParameterList). RUN WITH MAX 10 TOYS!!
lgiannes Dec 12, 2023
eef65dd
debug (getEffectiveParameterList). RUN WITH MAX 10 TOYS!!
lgiannes Dec 12, 2023
a4e9544
debug (getEffectiveParameterList). RUN WITH MAX 10 TOYS!!
lgiannes Dec 12, 2023
355c978
debug (getEffectiveParameterList). RUN WITH MAX 10 TOYS!!
lgiannes Dec 12, 2023
5d4d3bf
debug (getEffectiveParameterList). RUN WITH MAX 10 TOYS!!
lgiannes Dec 12, 2023
ed42706
debug (getEffectiveParameterList). RUN WITH MAX 10 TOYS!!
lgiannes Dec 12, 2023
90d9a34
debug (getEffectiveParameterList). RUN WITH MAX 10 TOYS!!
lgiannes Dec 12, 2023
bc59507
debug (getEffectiveParameterList). RUN WITH MAX 10 TOYS!!
lgiannes Dec 12, 2023
66efaf2
print out prior info
lgiannes Dec 12, 2023
cbb22fa
print out prior info
lgiannes Dec 12, 2023
c329eab
print out prior info
lgiannes Dec 12, 2023
1b943f9
check param value, does it change?
lgiannes Dec 13, 2023
2951644
check param value, does it change?
lgiannes Dec 13, 2023
dea72b8
check param value, does it change?
lgiannes Dec 13, 2023
e1cac0a
check param value, does it change?
lgiannes Dec 13, 2023
80d4627
check param value, does it change?
lgiannes Dec 13, 2023
4210405
check param value, does it change?
lgiannes Dec 13, 2023
85e2547
check param value, does it change?
lgiannes Dec 13, 2023
2fa7bb2
check param value, does it change?
lgiannes Dec 13, 2023
5543e88
check param value, does it change?
lgiannes Dec 13, 2023
beff0c6
check param value, does it change?
lgiannes Dec 13, 2023
599fdcf
check param value, does it change?
lgiannes Dec 13, 2023
fc9690c
check param value, does it change?
lgiannes Dec 13, 2023
8465bee
check param value, does it change?
lgiannes Dec 13, 2023
5c57711
check param value, does it change?
lgiannes Dec 13, 2023
3969d7c
check param value, does it change?
lgiannes Dec 13, 2023
8acc351
check param value, does it change?
lgiannes Dec 13, 2023
38f62c9
check param value, does it change?
lgiannes Dec 13, 2023
9d9dc7d
check param value, does it change?
lgiannes Dec 13, 2023
67060f4
check param value, does it change?
lgiannes Dec 13, 2023
8e869bd
check param value, does it change?
lgiannes Dec 13, 2023
7ae5d2e
check param value, does it change?
lgiannes Dec 13, 2023
d25f9fe
check param value, does it change?
lgiannes Dec 13, 2023
2f49b10
check param value, does it change?
lgiannes Dec 13, 2023
4ccbcb9
another override implementation of throwCorrelatedParameters
lgiannes Dec 18, 2023
671505f
update toolbox
lgiannes Dec 18, 2023
edd0119
implemented pedestal+gaus sampling distribution
lgiannes Dec 19, 2023
231ef4c
--
lgiannes Dec 19, 2023
b253bdf
save prior values in the output file
lgiannes Dec 22, 2023
9ff9372
debug for pedestal
lgiannes Jan 5, 2024
80cdbf5
debug for pedestal (see if it changes)
lgiannes Jan 5, 2024
64152f3
no change
lgiannes Jan 24, 2024
a1ceb2c
implemented TTree with throws in the PTheta format. [NEED TO CHECK SO…
lgiannes Jan 25, 2024
a4a2677
(maybe) fixed a bug: uncleared prior
lgiannes Jan 29, 2024
876bb87
removed re-throw: too much time-consuming
lgiannes Jan 30, 2024
dc099b9
Merge tag '1.8.0' into feature/biasTools-1
lgiannes Feb 2, 2024
6bab2bc
Merge tag '1.8.0' into feature/biasTools-1
lgiannes Feb 3, 2024
d874396
added marg_param_list
lgiannes Feb 4, 2024
bad5242
Merge remote-tracking branch 'origin/feature/biasTools-1' into featur…
lgiannes Feb 4, 2024
fdd352d
added cmakelists
lgiannes Feb 4, 2024
f128f85
hide error in JointProbability
lgiannes Feb 5, 2024
74b7142
restored JointProbability.cpp
lgiannes Feb 5, 2024
12977a2
commented "LogThrow" in JointProbability.cpp
lgiannes Feb 6, 2024
e3d0436
changed throw in error in SampleSet.cpp
lgiannes Feb 6, 2024
097254e
debug in SampleSet.cpp
lgiannes Feb 6, 2024
d91a215
SUPER verbose version HANDLE WITH CARE (Jointprobability.cpp)
lgiannes Feb 7, 2024
3399107
SUPER verbose version HANDLE WITH CARE (Jointprobability.cpp)
lgiannes Feb 7, 2024
2bfefb3
throw disable parameters as prior
lgiannes Feb 7, 2024
63cec4b
included parameters thrown as prior (unconstrained, used in PTheta)
lgiannes Feb 8, 2024
4070d0f
do not add to the margThrowTree the prior parameters
lgiannes Feb 14, 2024
1124d72
improved handling of unconstrained parameters to be thrown as priors
lgiannes Feb 14, 2024
e4684cf
Removed unconstrained parameters. Throws (I will do it in a separate …
lgiannes Feb 15, 2024
0b0fa22
debug message
lgiannes Mar 5, 2024
ab4ea78
adjusted, info on number of parameters
lgiannes Mar 5, 2024
2f2f71d
implementation of sampling from multivariate t-student distribution (…
lgiannes Mar 24, 2024
6ccb150
counterattack to double limit hit (first attempt)
lgiannes Mar 25, 2024
0142249
SampleSet.cpp: reduce log
lgiannes Mar 31, 2024
f0a1bc2
SampleSet.cpp: LogThrowIf instead of LogErrorIf
lgiannes Apr 2, 2024
aad3f4a
SampleSet.cpp: LogThrowIf instead of LogErrorIf
lgiannes Apr 2, 2024
14d717f
JointProbability.cpp: remove error if chisq=infinity
lgiannes Apr 2, 2024
9255435
JointProbability.cpp
lgiannes Apr 2, 2024
aab6614
remove all error/throws in JointProbability.cpp and SampleSet.cpp
lgiannes Apr 3, 2024
171cd9f
Merge remote-tracking branch 'origin/main' into feature/biasTools-1
lgiannes Apr 4, 2024
6b6a123
Merge remote-tracking branch 'origin/main' into feature/biasTools-1
lgiannes Apr 4, 2024
330786e
gitmodules
lgiannes Apr 4, 2024
24564b9
added sampling function to GundamUtils.h
lgiannes Apr 4, 2024
b6428b1
Merge remote-tracking branch 'origin/feature/biasTools-1' into featur…
lgiannes Apr 4, 2024
2cfa4b0
gundamMarginalise.cxx compliant with gundam version 1.9.0
lgiannes Apr 5, 2024
3cc1c61
sampler in GundamUtils (not anymore in generic-toolbox)
lgiannes Apr 5, 2024
f24c597
gundamMarginalise compliant with Gundam 1.9.0
lgiannes Apr 5, 2024
419eaf8
1.9.0
lgiannes Apr 5, 2024
54e2c9c
Merge tag '1.9.0' into feature/biasTools-1
lgiannes Apr 5, 2024
80b6a4a
gundamMarginalise compliant with Gundam 1.9.0 - bug fix in link libra…
lgiannes Apr 5, 2024
3882c69
reset parameters at the end of each LH computation
lgiannes Apr 5, 2024
29e3951
set verbosity properly
lgiannes Apr 5, 2024
a7b7cb1
Merge remote-tracking branch 'origin/main' into feature/marginaliseTool
nadrino Sep 24, 2024
3489e09
restoring state of DialResponseSupervisor.cpp
nadrino Sep 24, 2024
168ee72
link lib to the fitter
nadrino Sep 24, 2024
1440120
resync generictoolbox
nadrino Sep 24, 2024
bedd3f0
getting rid of outdated option
nadrino Sep 24, 2024
d7c808a
restoring header declarations
nadrino Sep 24, 2024
64e8eb9
adapting with the new structure of the propagator
nadrino Sep 24, 2024
4b876b8
Merge pull request #637 from gundam-organization/main
nadrino Sep 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
5 changes: 3 additions & 2 deletions src/Applications/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Applications

set(
APPLICATION_LIST
set( APPLICATION_LIST
# GUNDAM apps
gundamFitter
gundamFitReader
Expand All @@ -12,6 +11,7 @@ set(
gundamConfigCompare
gundamPlotExtractor
gundamConfigUnfolder
gundamMarginalise
)


Expand Down Expand Up @@ -74,6 +74,7 @@ endforeach()
# Dependencies
target_link_libraries( gundamFitter GundamFitter )
target_link_libraries( gundamCalcXsec GundamFitter ) # using the fitter engine to parse back the config file
target_link_libraries( gundamMarginalise GundamFitter )
target_link_libraries( gundamFitReader GundamUtils )
target_link_libraries( gundamInputZipper GundamUtils )
target_link_libraries( gundamFitCompare GundamUtils )
Expand Down
Loading