Merge branch 'test_NLL' into 'master'
7430db7503b3
Actions

Description

Merge branch 'test_NLL' into 'master'

Test uno and split forwards and backwards separately

See merge request hej/HEJ!44

Details

Provenance

Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>	Authored on Jun 18 2019, 8:48 AM
hej	Pushed on Jan 14 2021, 6:07 PM

Parents

rHEJ1693479f1904: Check uno and split forward and backward separately
rHEJ7a0813ff45d4: Merge branch 'qqxPhspGen' into 'master'

Branches

Unknown

Tags

Unknown

Event Timeline

Jeppe R. Andersen <jeppe.andersen@durham.ac.uk> committed rHEJ7430db7503b3: Merge branch 'test_NLL' into 'master' (authored by Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>).Jun 18 2019, 8:48 AM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

1693479f1904 Check uno and split forward and backward separately
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
0e0044213b62 Use the correct set of events for the (e+,nu)4j qqxmid test
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
ba357be44562 Add tests explicitly for g->q qx (e+,nu) and central g* g* -> q qx (e+,nu)
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
1dfc8583c987 Change of function names: is_Wp_Current -> is_Wp_Change etc.
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
dfdbc745eb60 Merge branch 'WCurrentClassify' into 'Classification'
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
79f7b23f5b23 ALtered new classify to use iterators. (In prep for reversing implementation)
Author
black
Browse Repository
No Builds
No Audits
53d063ec3ca5 Neatened book-keeping in new classify.
Author
black
Browse Repository
No Builds
No Audits
5f357969144a Use is_valid_IF() in search of MidQQbar also.
Author
black
Browse Repository
No Builds
No Audits
61a04e8122b3 Implemented helper function to remove some code duplicity.
Author
black
Browse Repository
No Builds
No Audits
1d834e82e8c5 Removed Dead code
Author
black
Browse Repository
No Builds
No Audits
fcf218cb97e0 Altered comments for readability. Visuals.
Author
black
Browse Repository
No Builds
No Audits
3532eac1ec03 Used is_Pure_Current() to improve readability in new classify
Author
black
Browse Repository
No Builds
No Audits
0d43f37338d0 Changed new classification to use is_W_Current() functions.
Author
black
Browse Repository
No Builds
No Audits
982d2c0f6e5d Merge remote-tracking branch 'origin/master' into Classification
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
21d75d2cde8f Merge remote-tracking branch 'origin/qqxPhspGen' into Classification
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
cac647c2e892 #ifdef -> #if in debug print statements
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
deb9d6d9acca Merge qqxPhspGen and correct bug in classification of forward W unordered
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
d6c3c377349c Merge remote-tracking branch 'origin/qqxPhspGen' into Classification
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
eff774cd3f3a Enable the new jet requirement at 90% transverse momentum.
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
da0ba709fd7b Make YAMLreader understand the new options again
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
057d1fe51cd0 Disable printing unless NPRINT flag is set
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
462df056d6c3 Merge branch 'master' into Classification Also, change setting in…
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
7bd300f87906 remove:
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
6dcc0e708ab5 'comment' out unused code of old classification
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
74a8f77ddc7b Correct spelling in comment
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
91051ac97df0 Theck the pt contribution also to central qqx-jets
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
849cef35ea4f Now also checks qqx forward and backward. Now only needs to check middle qqx…
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
c032c8a39213 Require that the relevant partons make up 90% of the jet pt
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
d0c36407103d Delete an offending whitespace
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
3e8bcea6bf3e Code cleanup for flavour changes in checks of W+ and W- emissions
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
f96c97cb48d6 remove 'reserve' for the filter_awzh_boson
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
54b95b0c3e30 Now works for more than one boson
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
b4e3719d8090 Use that bools can be used as integers
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
f981b47e8fdf More indentation
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
e3997b83b274 Remove some white spaces to avoid the wrath of Khan.
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
3bc6b5258f5d Remember to count Ws for gluon -> qqx W impact factors
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
3a37d7ecac10 Now actually finds the boson. Can be improved, but passes all the tests.
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
ddc08355fea2 Works for just one boson in the input
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
88b4398bc322 Make the logic correct. Really.
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
a154f44ce7a3 Correct the logic conversion of true to 1
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
4763190171c5 Count the number of WP/Wm required by the currents identified
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
6c9261b2cc7e prevpartonfN was initialised out by one. Now correct.
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
fab4dd43506f Remove iterators from classify_new
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
9f14c9231717 New classify now remembers that the at()-indexing starts at 0.
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
d66187a0c656 Include printouts only if DEBUG is set
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
e899d3015260 Merge branch 'Classification' of gitlab.dur.scotgrid.ac.uk:hej/HEJ into…
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
e641b853ec17 std::cout messages to debug the new classification
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits
c84f58813c68 Removed `AllTypes` variable
Author
hej
Browse Repository
No Builds
No Audits
a686be19fc55 Added linebreaks
Author
hej
Browse Repository
No Builds
No Audits
0e4a11242e0e Returns event type. And it might even be correct
Author
Jeppe R. Andersen <jeppe.andersen@durham.ac.uk>
Browse Repository
No Builds
No Audits

Changes (14)

Path

Size

CMakeLists.txt

include/

HEJ/

CrossSectionAccumulator.hh

src/

bin/

rHEJ7430db7503b3

View Options

CMakeLists.txt

View Options

include/HEJ/CrossSectionAccumulator.hh

View Options

include/HEJ/Particle.hh

View Options

include/HEJ/event_types.hh

View Options

src/Event.cc

View Options

src/LesHouchesWriter.cc

View Options

src/PhaseSpacePoint.cc

View Options

src/YAMLreader.cc

View Options

src/bin/HEJ.cc

View Options

t/check_lhe.cc

View Options

t/check_res.cc

View Options

t/test_classify.cc

View Options

t/test_classify_new.cc

View Options

Merge branch 'test_NLL' into 'master'7430db7503b3Actions

Description

Details

Event Timeline

Merged Changes

Changes (14)

rHEJ7430db7503b3

CMakeLists.txt

include/HEJ/CrossSectionAccumulator.hh

include/HEJ/Particle.hh

include/HEJ/event_types.hh

src/Event.cc

src/LesHouchesWriter.cc

src/PhaseSpacePoint.cc

src/YAMLreader.cc

src/bin/HEJ.cc

t/check_lhe.cc

t/check_res.cc

t/test_classify.cc

t/test_classify_new.cc

t/test_psp.cc

Merge branch 'test_NLL' into 'master'
7430db7503b3
Actions