MAUS

Merge lp:~c-e-pidcott/maus/1389a into lp:maus/merge

  1. 1389a
  2. Merge into merge
Proposed by Adam Dobbs
Status: Merged
Approved by: Adam Dobbs
Approved revision: 1142
Merged at revision: 1036
Proposed branch: lp:~c-e-pidcott/maus/1389a
Merge into: lp:maus/merge
Diff against target: 48 lines (+11/-5)
2 files modified
bin/Global/pdf_example_datacard.py (+9/-4)
bin/Global/pid_example_datacard.py (+2/-1)
To merge this branch: bzr merge lp:~c-e-pidcott/maus/1389a
Reviewer Review Type Date Requested Status
Adam Dobbs Approve
Review via email: mp+286936@code.launchpad.net

This proposal supersedes a proposal from 2016-02-23.

Description of the change

There have literally only been changes to the comments in two example datacard files, to add some clarity.

To post a comment you must log in.
Revision history for this message
Adam Dobbs (ajdobbs) wrote :

This looks fine, I have resubmitted it for merging into the merge branch rather than the release branch (speeds closing the issue). I'll try and merge when the release changes settle down...

Revision history for this message
Adam Dobbs (ajdobbs) :
review: Approve
lp:~c-e-pidcott/maus/1389a updated
1143. By Celeste Pidcott

merged in from maus v2.0.0

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/Global/pdf_example_datacard.py'
2--- bin/Global/pdf_example_datacard.py 2016-02-17 01:31:25 +0000
3+++ bin/Global/pdf_example_datacard.py 2016-02-23 18:08:33 +0000
4@@ -6,14 +6,18 @@
5 InputPySpillGenerator in MAUS, however in the latter case, the number
6 of particles per spill must be set to 1 when simulating, as
7 MapCppGlobalTrackMatching currently can't handle multiple particles
8-per spill, due to the MC trigger
9+per spill, due to the MC trigger. Also, when running TrackMatching,
10+the datacard track_matching_pid_hypothesis should be set to a single
11+pid hypothesis (doesn't matter which) and the track_matching_tolerances
12+datacards should be increased by a factor of 10 (until optimisations
13+have been put in place - 23/02/2016)
14
15 Directories will be created in files/PID/ for each particle hypothesis,
16 tagged with the unique identifier. These directories will contain the
17 root files containing the individual histograms. These histograms should then
18 be combined into a single root file, using the hadd command (see hadd man
19-page for usage), and this is the root file that will be used by when running
20-the global PID
21+page for usage), and this is the root file that will be used when running
22+the global PID (the file set at by PID_PDFs_file datacard)
23 """
24 # pylint: disable=C0103, W0611
25
26@@ -36,7 +40,8 @@
27 # Tag used by both MapCppGlobalPID and ReduceCppGlobalPID, determines which
28 # PDFs to perform PID against/which PDFs to produce (in this case, set based
29 # upon input MC beam). A typical tag here would be the emittance and momentum,
30-# e.g. 3-140, 6-200, etc.
31+# e.g. 3-140, 6-200, etc. Alternatively, users may choose to enter the run
32+# number they are simulating for here.
33 # The tag used for the PDFs must match the tag you use when doing PID
34 pid_beam_setting = "6-200"
35
36
37=== modified file 'bin/Global/pid_example_datacard.py'
38--- bin/Global/pid_example_datacard.py 2016-02-17 01:31:25 +0000
39+++ bin/Global/pid_example_datacard.py 2016-02-23 18:08:33 +0000
40@@ -48,7 +48,8 @@
41
42 # Tag used by both MapCppGlobalPID and ReduceCppGlobalPID, determines which
43 # PDFs to perform PID against. A typical tag here
44-# would be the emittance and momentum, e.g. 3-140, 6-200, etc.
45+# would be the emittance and momentum, e.g. 3-140, 6-200, etc. Alternatively,
46+# users may choose to enter the run number they are simulating for here.
47 # The tag used must match the tag that was provided during PDF production.
48 pid_beam_setting = "6-200"
49

Subscribers

People subscribed via source and target branches