Merge lp:~s-h-wilbur/maus/mybranch into lp:maus

[Scott]

My previous fix to the TOF MC digitizer fixed a 60-500 ps error, but broke Rayner's reconstruction algorithm (on MC) because both PMTs in a slab would get a hit at the same time. This change fixes that issue.

[Adam Dobbs (ajdobbs)]

Thanks, performing the merge, will let you know...

[Adam Dobbs (ajdobbs)]

OK, I found an integration test failure:

Check that we can run the simulation, make plots ... Kolmo Prob h1 = tof01_ref, sum bin content =177 effective entries =177
 Kolmo Prob h2 = tof01, sum bin content =237 effective entries =237
 Kolmo Prob = 9.44738e-05, Max Dist = 0.221698
FAIL

This arises from: tests/integration/test_simulation/test_tof/test_tof.py

Please revise and resubmit. Thanks, Ad

review: Needs Fixing

[lp:~s-h-wilbur/maus/mybranch]

730. By Scott Wilbur <email address hidden> on 2017-03-29

updated test_tof reference plot

=== modified file 'src/map/MapCppTOFMCDigitizer/MapCppTOFMCDigitizer.cc'
--- src/map/MapCppTOFMCDigitizer/MapCppTOFMCDigitizer.cc	2016-12-15 15:25:48 +0000
+++ src/map/MapCppTOFMCDigitizer/MapCppTOFMCDigitizer.cc	2017-03-29 14:44:02 +0000
@@ -229,6 +229,7 @@
       // find distances from hit to pmt geom
       double dist1 = ( hpos - (slabPos + pmt1Pos) ).mag();
       double dist2 = ( hpos - (slabPos + pmt2Pos) ).mag();
+      double dist_average = (dist1 + dist2)/2;
 
       // convert edep to photoelectrons for this slab/pmt
       // can't convert to adc yet since we need to add up ph.el's
@@ -244,8 +245,8 @@
       double htime = hit.GetTime() - gentime;
 
       // propagate time to pmt & smear by the resolution
-      double time1 = CLHEP::RandGauss::shoot((htime + dist1/csp) , tres);
-      double time2 = CLHEP::RandGauss::shoot((htime + dist2/csp) , tres);
+      double time1 = CLHEP::RandGauss::shoot((htime + (dist1-dist_average)/csp) , tres);
+      double time2 = CLHEP::RandGauss::shoot((htime + (dist2-dist_average)/csp) , tres);
       double tdc2time = _configJSON["TOFtdcConversionFactor"].asDouble();
 
       // convert to tdc
 
=== modified file 'tests/integration/test_simulation/test_tof/tof_mc_plots_ref.root'
 Binary files tests/integration/test_simulation/test_tof/tof_mc_plots_ref.root	2016-12-15 15:25:48 +0000 and tests/integration/test_simulation/test_tof/tof_mc_plots_ref.root	2017-03-29 14:44:02 +0000 differ