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

[Celeste Pidcott]

Fixed a typo and made PDF generator use InputCppRootData

[Adam Dobbs (ajdobbs)]

Thanks Celeste. Is InputCppRootData working? Last I looked it would fall over quite quickly with some sort of buffer overrun...

[Celeste Pidcott (c-e-pidcott)]

Um, it's never given me any problems and I've run it over hundreds of thousands of events...

On 18 Apr 2016 14:25, Adam Dobbs <email address hidden> wrote:
Thanks Celeste. Is InputCppRootData working? Last I looked it would fall over quite quickly with some sort of buffer overrun...
--
https://code.launchpad.net/~c-e-pidcott/maus/1389a/+merge/292124
You are the owner of lp:~c-e-pidcott/maus/1389a.

[chrisrogers1234 (chris-rogers)]

I've also used it quite a bit without a problem, but happy to receive a
bug report if there is something fishy.

Chris

On 18/04/16 14:54, Celeste Pidcott wrote:
> Um, it's never given me any problems and I've run it over hundreds of thousands of events...
>
> On 18 Apr 2016 14:25, Adam Dobbs <email address hidden> wrote:
> Thanks Celeste. Is InputCppRootData working? Last I looked it would fall over quite quickly with some sort of buffer overrun...
> --
> https://code.launchpad.net/~c-e-pidcott/maus/1389a/+merge/292124
> You are the owner of lp:~c-e-pidcott/maus/1389a.
>

--
ASTeC Intense Beams Group

tel: [phone]

Building R2,
Rutherford Appleton Laboratory,
Harwell Science and Innovation Campus,
Didcot.
OX11 0QX

=== modified file 'bin/Global/pid_pdf_generator.py'
--- bin/Global/pid_pdf_generator.py	2016-02-17 01:31:25 +0000
+++ bin/Global/pid_pdf_generator.py	2016-04-18 09:44:09 +0000
@@ -16,7 +16,7 @@
     """
 
     # Take as input a maus root file.
-    my_input = MAUS.InputCppRoot()
+    my_input = MAUS.InputCppRootData()
 
     my_output = MAUS.OutputPyDoNothing()
 

=== modified file 'src/map/MapCppGlobalPID/MapCppGlobalPID.cc'
--- src/map/MapCppGlobalPID/MapCppGlobalPID.cc	2016-02-16 23:41:03 +0000
+++ src/map/MapCppGlobalPID/MapCppGlobalPID.cc	2016-04-18 09:44:09 +0000
@@ -560,7 +560,7 @@
 	      const_cast<MAUS::DataStructure::Global::Track*>
 	      (const_tracks.at(track_j));
 	    perform_pid("MapCppGlobalPID-Final_Through_US",
-			"Through_DS_PID", US_track, _pid_vars,
+			"Through_US_PID", US_track, _pid_vars,
 			_pid_beamline_polarity,
 			_pid_beam_setting, global_event);
 	  }