Viewing all changes in revision 798.3.57.
- Committer: Chris Rogers
- Date: 2016-10-17 09:46:48 UTC
- mfrom: (1143 merge)
- mto: (1153.2.1 tracking_errors_merge)
- mto: This revision was merged to the branch mainline in revision 1161.
- Revision ID: chris.rogers@stfc.ac.uk-20161017094648-zp67bbzkdn4faeap
Merge in trunk
- files added:
- bin/examples/logging
- bin/user/batch_cluster
- bin/user/batch_cluster/beams
- bin/user/batch_cluster/datacards
- bin/user/batch_cluster/geometry
- bin/user/batch_cluster/output
- bin/user/batch_cluster/output/analysis
- bin/user/batch_cluster/output/batch_messages
- bin/user/batch_cluster/output/simulation
- bin/user/batch_cluster/scripts
- bin/user/batch_cluster/scripts/analysis
- bin/user/batch_cluster/scripts/batch
- bin/user/batch_cluster/scripts/simulation
- src/map/MapCppTrackerClusterRecon
- src/map/MapCppTrackerPatternRecognition
- src/map/MapCppTrackerSpacePointRecon
- src/map/MapCppTrackerTrackFit
- tests/integration/test_scifi/test_scifi_kalman_straight
- tests/integration/test_scifi/test_scifi_kalman_straight/geometry_07417
- tests/test_data
- tests/test_data/scifi_test_data
- files removed:
- src/reduce/ReduceCppTofCalib/ReduceCppTofCalib.i
- files renamed:
- src/legacy/Interface/Squeak.cc => src/common_cpp/Utils/Squeak.cc
- src/legacy/Interface/Squeak.hh => src/common_cpp/Utils/Squeak.hh
- src/map/MapCppTrackerRecon/test_helical_digits.json => tests/test_data/scifi_test_data/test_helical_digits.json
- src/map/MapCppTrackerRecon/test_straight_digits.json => tests/test_data/scifi_test_data/test_straight_digits.json
- files modified:
- .bzrignore
expand all
collapse all
added
removed
