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

[Celeste Pidcott]

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

[lp:~c-e-pidcott/maus/1389a]

1143. By Celeste Pidcott on 2016-02-25

merged in from maus v2.0.0

1144. By Celeste Pidcott on 2016-03-03

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 on 2016-03-03

merged in from maus/merge

1146. By Celeste Pidcott on 2016-04-14

merge maus v2.1

1147. By Celeste Pidcott on 2016-04-14

merged in from maus/merge

1148. By Celeste Pidcott on 2016-04-14

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

1149. By Celeste Pidcott on 2016-05-26

updates to global pid section of maus user guide

1150. By Celeste Pidcott on 2016-05-26

merged in from maus v2.3.1

1151. By Celeste Pidcott on 2016-05-26

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

1152. By Celeste Pidcott on 2016-06-02

fixed typo in MapCppGlobalPID

1153. By Celeste Pidcott on 2016-06-07

fix custom PIDVar selection in MapCppGlobalPID

1154. By Celeste Pidcott on 2016-06-07

merged in from global-recon-rk

1155. By Celeste Pidcott on 2016-06-13

small documentation changes

1156. By Celeste Pidcott on 2016-07-12

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

1157. By Celeste Pidcott on 2016-07-12

made emr density variables check for an emr hit first

1158. By Celeste Pidcott on 2016-07-18

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

1159. By Celeste Pidcott on 2016-07-24

fix to avoid segfault due to bad global tracker points

1160. By Celeste Pidcott on 2016-07-29

fixed a typo that was causing PID unit test failures

1161. By Celeste Pidcott on 2016-08-01

made PIDvariables use EMR density as a percentage

Unmerged revisions

1161. By Celeste Pidcott on 2016-08-01

made PIDvariables use EMR density as a percentage

1160. By Celeste Pidcott on 2016-07-29

fixed a typo that was causing PID unit test failures

1159. By Celeste Pidcott on 2016-07-24

fix to avoid segfault due to bad global tracker points

1158. By Celeste Pidcott on 2016-07-18

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

1157. By Celeste Pidcott on 2016-07-12

made emr density variables check for an emr hit first

1156. By Celeste Pidcott on 2016-07-12

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

=== 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 @@
 InputPySpillGenerator in MAUS, however in the latter case, the number
 of particles per spill must be set to 1 when simulating, as
 MapCppGlobalTrackMatching currently can't handle multiple particles
-per spill, due to the MC trigger
+per spill, due to the MC trigger. Also, when running TrackMatching,
+the datacard track_matching_pid_hypothesis should be set to a single
+pid hypothesis (doesn't matter which) and the track_matching_tolerances
+datacards should be increased by a factor of 10 (until optimisations
+have been put in place - 23/02/2016)
 
 Directories will be created in files/PID/ for each particle hypothesis,
 tagged with the unique identifier. These directories will contain the
 root files containing the individual histograms. These histograms should then
 be combined into a single root file, using the hadd command (see hadd man
-page for usage), and this is the root file that will be used by when running
-the global PID
+page for usage), and this is the root file that will be used when running
+the global PID (the file set at by PID_PDFs_file datacard)
 """
 # pylint: disable=C0103, W0611
 
@@ -36,7 +40,8 @@
 # Tag used by both MapCppGlobalPID and ReduceCppGlobalPID, determines which
 # PDFs to perform PID against/which PDFs to produce (in this case, set based
 # upon input MC beam). A typical tag here would be the emittance and momentum,
-# e.g. 3-140, 6-200, etc.
+# e.g. 3-140, 6-200, etc. Alternatively, users may choose to enter the run
+# number they are simulating for here.
 # The tag used for the PDFs must match the tag you use when doing PID
 pid_beam_setting = "6-200"
 

=== 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 @@
 
 # Tag used by both MapCppGlobalPID and ReduceCppGlobalPID, determines which
 # PDFs to perform PID against. A typical tag here
-# would be the emittance and momentum, e.g. 3-140, 6-200, etc.
+# would be the emittance and momentum, e.g. 3-140, 6-200, etc. Alternatively,
+# users may choose to enter the run number they are simulating for here.
 # The tag used must match the tag that was provided during PDF production.
 pid_beam_setting = "6-200"