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.

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

Multiweight implementation #205

Draft
wants to merge 109 commits into
base: substructure
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
22ac078
mitigating weight to multiweight
jackaraz Jun 24, 2023
bfab5b2
multiweight adaptation
jackaraz Jun 24, 2023
5e405c6
refactor
jackaraz Jun 26, 2023
2c71717
add basic positive/negative weight strucutre
jackaraz Jun 27, 2023
c0648c2
update weight base
jackaraz Jun 27, 2023
8b32077
update readers
jackaraz Jun 27, 2023
b7fad97
update region selection manager
jackaraz Jun 27, 2023
66c0680
update cutflow
jackaraz Jun 27, 2023
f7d5e8b
update histograms
jackaraz Jun 27, 2023
f9d2e25
update LHE writer
jackaraz Jun 27, 2023
a3cbd62
bug fixes
jackaraz Jun 27, 2023
13db690
addd accesor for weight names
jackaraz Jun 27, 2023
d56d201
add preparation for execution
jackaraz Jun 27, 2023
a92eabd
update `main.cpp` writers
jackaraz Jun 27, 2023
ef9177c
bug fix in initialisation
jackaraz Jun 28, 2023
fd84f09
bugfix in histogramming
jackaraz Jun 28, 2023
c12766d
change basics to histo structures
jackaraz Jun 29, 2023
32fc384
update basics.h
jackaraz Jun 29, 2023
8c3553b
remove `weight_definition_`
jackaraz Jun 29, 2023
e95b46a
remove `weight_definition_`
jackaraz Jun 29, 2023
4aa439d
update exception
jackaraz Jun 29, 2023
9ad2634
update exception text
jackaraz Jun 29, 2023
55da958
update docstring
jackaraz Jun 29, 2023
e6e19fc
update exception message
jackaraz Jun 29, 2023
12b3f26
update docstring
jackaraz Jun 29, 2023
c0c9139
update execution order
jackaraz Jun 29, 2023
ac3a7a0
update docstring
jackaraz Jun 29, 2023
214b672
update exception handler
jackaraz Jun 29, 2023
f20edd7
update docstring
jackaraz Jun 29, 2023
9234845
remove unnecessary decleration
jackaraz Jun 29, 2023
3779599
remove comment
jackaraz Jun 29, 2023
9174303
uncomment resize
jackaraz Jun 29, 2023
3c9e610
remove weight definition
jackaraz Jun 29, 2023
fd692be
add weight shortcut
jackaraz Jun 29, 2023
bcc6eb3
clean the code
jackaraz Jun 29, 2023
ac59bd2
update getweight
jackaraz Jun 29, 2023
99796ed
bugfix
jackaraz Jun 29, 2023
250d98a
update histogram structure
jackaraz Jun 29, 2023
80d5b01
update histogramming module
jackaraz Jun 29, 2023
c3ff020
update changelog
jackaraz Jun 29, 2023
cc192ae
write weight names
jackaraz Jun 30, 2023
7ad2f01
add weight names to the summary
jackaraz Jun 30, 2023
4f1230c
cleaning
jackaraz Jun 30, 2023
ed02895
update reference to weight names
jackaraz Jun 30, 2023
ccc3549
initialise weight configuration
jackaraz Jun 30, 2023
7a6d1c7
integrate weight config
jackaraz Jun 30, 2023
fc7862e
add properties
jackaraz Jun 30, 2023
5406657
add weight reader
jackaraz Jun 30, 2023
981c36e
revert some of the structure
jackaraz Jun 30, 2023
7c3f9c4
add processor
jackaraz Jun 30, 2023
6619661
adaptation
jackaraz Jun 30, 2023
f1d9126
add lhapdf list
jackaraz Jul 14, 2023
e2bd263
create dataset for weight collection
jackaraz Jul 17, 2023
82d7a02
additional features
jackaraz Jul 17, 2023
0ea5874
bugfix
jackaraz Jul 17, 2023
b412479
add dynamic scale choice and npoint scale var
jackaraz Jul 17, 2023
59911c0
add an extra array
jackaraz Jul 17, 2023
a6232c9
extend data handling
jackaraz Jul 17, 2023
3eef3af
simplify the code
jackaraz Jul 17, 2023
946f726
incomplete multiweight treatment
jackaraz Jul 17, 2023
746240d
extended reporting
jackaraz Jul 18, 2023
0083d63
add debug sections
jackaraz Jul 18, 2023
f329ab8
bugfix
jackaraz Jul 18, 2023
9205e66
bugfix
jackaraz Jul 18, 2023
c4738af
temporary fix allowing to at least install delphes. To be further fixed
BFuks Jul 18, 2023
f1c3927
Updating uncertainty calculations
BFuks Jul 20, 2023
6f39dad
Merge branch 'substructure' into multiweight
jackaraz Jul 21, 2023
2a90913
return weight collection object for queries
jackaraz Jul 21, 2023
b23ebd8
efficiency updates
jackaraz Jul 21, 2023
dc8f0cd
root plots
BFuks Jul 25, 2023
01ef527
small bug fix in root file generation
BFuks Jul 25, 2023
0572f22
bugfix for histogram initialisation
jackaraz Jul 25, 2023
23f5525
starting to fix bugs in cutflows + generalisation
BFuks Jul 26, 2023
e026f3d
restore
jackaraz Jan 2, 2024
e5e04d0
add multiweight handler
jackaraz Jan 3, 2024
93f1993
minor fixes
jackaraz Jan 3, 2024
503b28e
add separate multiweight reader
jackaraz Jan 3, 2024
98c6d1c
adapt
jackaraz Jan 3, 2024
014545a
Merge branch 'substructure' into multiweight
jackaraz Jan 10, 2024
f6360ff
fix for scale vars
jackaraz Jan 10, 2024
9ef2cc0
overlap removal
jackaraz Jan 10, 2024
ec50d43
convert print to debug
jackaraz Jan 10, 2024
51c62ae
add scale vars
jackaraz Jan 10, 2024
bed7c97
extend the usage
jackaraz Jan 10, 2024
b4391c0
add combination between pdf and scale unc
jackaraz Jan 10, 2024
a452b1f
only write total unc
jackaraz Jan 10, 2024
1951263
compactify the loop
jackaraz Jan 11, 2024
eef8496
silence the warnings
jackaraz Jan 11, 2024
bfb3334
implement eigvectors method
jackaraz Jan 11, 2024
dbb376e
bugfix
jackaraz Jan 11, 2024
255643e
update version
jackaraz Jan 11, 2024
55e6e44
multiple fixes
jackaraz Jan 11, 2024
b603745
add lhapdf info
jackaraz Jan 11, 2024
534099e
improvement
jackaraz Jan 11, 2024
fbb7185
replace lhapdf info
jackaraz Jan 11, 2024
bac598e
sort pdfset, improve eff
jackaraz Jan 11, 2024
777622a
add protection against mistakes in files
jackaraz Jan 15, 2024
9a79370
update comment
jackaraz Jan 17, 2024
3de9da1
Small extra fix for MadSTR-generated events
BFuks Jan 19, 2024
354307b
Small extra fix for MadSTR-generated events (part 2)
BFuks Jan 19, 2024
5a77e46
typo fix
jackaraz Jan 24, 2024
e5e983d
increase protection
jackaraz Jan 24, 2024
9477304
fix for multiweighted-events without PDF variation
BFuks Feb 7, 2024
10df24d
Fixing resubmit bug + invisible state bug (thanks to L. Munoz)
BFuks Jul 1, 2024
923554c
Adding multiweight support in the LHE writer
BFuks Jul 1, 2024
cef926e
LHE files and multiweight support fixed/added
BFuks Jul 2, 2024
a7af8c0
Updating the plotflow and the layout
BFuks Jul 3, 2024
dbd1944
fixing the importlib issue in bin/ma5
BFuks Jul 5, 2024
cfb879e
Adding scale information to the dataset printout
BFuks Jul 28, 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
1 change: 1 addition & 0 deletions madanalysis/IOinterface/job_writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,7 @@ def CreateMainFct(self,file,analysisName,outputName):
file.write(' fastsim1->Execute(mySample,myEvent);\n')
elif self.main.fastsim.package=="delphesMA5tune":
file.write(' fastsim1->Execute(mySample,myEvent);\n')
file.write(' manager.PrepareForExecution(mySample, myEvent);\n')
file.write(' if (!analyzer1->Execute(mySample,myEvent)) continue;\n')
if self.output!="" and not self.output.lower().endswith('root'):
file.write(' writer1->WriteEvent(myEvent,mySample);\n')
Expand Down
Loading