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

Proposed by Celeste Pidcott
Status: Superseded
Proposed branch: lp:~c-e-pidcott/maus/1389a
Merge into: lp:maus
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
MAUS release managers Pending
Review via email: mp+286912@code.launchpad.net

This proposal has been superseded by 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.
lp:~c-e-pidcott/maus/1389a updated
1143. By Celeste Pidcott

merged in from maus v2.0.0

1144. By Celeste Pidcott

Some edits to ComPIDVar limits, and a tweak to ReduceCppGlobalPID to account for times when trackmatching hasn't made a through track

1145. By Celeste Pidcott

merged in from maus/merge

1146. By Celeste Pidcott

merge maus v2.1

1147. By Celeste Pidcott

merged in from maus/merge

1148. By Celeste Pidcott

fix typo in PID mapper, change pid_pdf_generator.py to use InputCppRootData

1149. By Celeste Pidcott

updates to global pid section of maus user guide

1150. By Celeste Pidcott

merged in from maus v2.3.1

1151. By Celeste Pidcott

merged in changes from global-recon-rk, mostly addressing the global event memory leak

1152. By Celeste Pidcott

fixed typo in MapCppGlobalPID

1153. By Celeste Pidcott

fix custom PIDVar selection in MapCppGlobalPID

1154. By Celeste Pidcott

merged in from global-recon-rk

1155. By Celeste Pidcott

small documentation changes

1156. By Celeste Pidcott

a bug fix for PIDVarB and merging in a couple of trackmatching changes

1157. By Celeste Pidcott

made emr density variables check for an emr hit first

1158. By Celeste Pidcott

check for valid trackpoints in several variables- TMing seems to be sending some dodgy tracker points through

1159. By Celeste Pidcott

fix to avoid segfault due to bad global tracker points

1160. By Celeste Pidcott

fixed a typo that was causing PID unit test failures

1161. By Celeste Pidcott

made PIDvariables use EMR density as a percentage

Unmerged revisions

1161. By Celeste Pidcott

made PIDvariables use EMR density as a percentage

1160. By Celeste Pidcott

fixed a typo that was causing PID unit test failures

1159. By Celeste Pidcott

fix to avoid segfault due to bad global tracker points

1158. By Celeste Pidcott

check for valid trackpoints in several variables- TMing seems to be sending some dodgy tracker points through

1157. By Celeste Pidcott

made emr density variables check for an emr hit first

1156. By Celeste Pidcott

a bug fix for PIDVarB and merging in a couple of trackmatching changes

Preview Diff

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

Subscribers

People subscribed via source and target branches