Viewing all changes in revision 656.13.34.
- Committer: Chris Rogers
- Date: 2012-10-13 18:43:00 UTC
- mfrom: (663.6.137 merge)
- mto: (663.6.204 merge)
- mto: This revision was merged to the branch mainline in revision 680.
- Revision ID: chris.rogers@stfc.ac.uk-20121013184300-ry9q81m45dmtgejr
Bring control room branch into line with trunk
- files added:
- bin/utilities/get_beamline_info.py
- src/legacy/Interface/Interpolation
- src/legacy/Interface/Meshing
- src/reduce/ReducePyCkovPlot
- tests/integration/test_simulation/test_physics_model_full/files/g4mice
- tests/integration/test_simulation/test_physics_model_full/files/muon1
- files removed:
- bin/examples/simple_histogram_example.py
- src/map/MapPyRemoveTracks
- src/reduce/ReducePyHistogramTDCADCCounts
- files renamed:
- doc/doc_src/data_structure.dot => doc/doc_src/spill_structure.dot
- doc/doc_src/data_structure.png => doc/doc_src/spill_structure.png
- src/common_cpp/Converter/DataConverters/CppJsonConverter.cc => src/common_cpp/Converter/DataConverters/CppJsonSpillConverter.cc
- src/common_cpp/Converter/DataConverters/CppJsonConverter.hh => src/common_cpp/Converter/DataConverters/CppJsonSpillConverter.hh
- tests/integration/test_mauscelery/ => tests/integration/test_distributed_processing/
- tests/integration/test_docstore/ => tests/integration/test_distributed_processing/test_docstore/
- files modified:
- .bzrignore
expand all
collapse all
added
removed
doc/doc_src/file_structure.png
