← Back to branch summary

~jan.greis/maus/1811

~jan.greis/maus/1811

Viewing all changes in revision 663.6.342.

Committer: Chris Rogers
Date: 2015-06-12 09:41:05 UTC
mfrom: (697.47.49 merge)
mto: (697.78.1 maus_rogers_1312a)
mto: This revision was merged to the branch mainline in revision 710.
Revision ID: chris.rogers@stfc.ac.uk-20150612094105-5pfk193ak35nn7fr

Merge from trunk

files added:
files/cabling/DAQChannelMap_preRun6541.txt

src/common_cpp/API/PyWrapOutputBase-inl.hh

src/common_cpp/API/PyWrapOutputBase.hh

src/common_cpp/Converter/DataConverters/PrimitiveConvertersData.hh

src/common_cpp/Converter/DataConverters/PrimitiveConvertersJobFooter.hh

src/common_cpp/Converter/DataConverters/PrimitiveConvertersJobHeader.hh

src/common_cpp/Converter/DataConverters/PrimitiveConvertersRunFooter.hh

src/common_cpp/Converter/DataConverters/PrimitiveConvertersRunHeader.hh

third_party/install/etc

third_party/source/root_v5.34.30.source.tar.gz.md5

files removed:
src/output/OutputCppRoot/OutputCppRoot.i

third_party/bash/30clhep.bash

third_party/source/root_v5.34.07.source.tar.gz.md5

files modified:
README

RELEASENOTES

bin/analyze_data_offline.py

bin/examples/load_root_file_cpp/Makefile

bin/examples/simple_scalers_example.py

bin/utilities/download_geometry.py

configure

doc/doc_src/introduction.tex

doc/doc_src/mice_modules/mice_module_fields.tex

doc/maus_user_guide.pdf

files/cabling/DAQChannelMap.txt

install_build_test.bash

src/common_cpp/API/OutputBase-inl.hh

src/common_cpp/API/OutputBase.hh

src/common_cpp/Converter/ConverterFactory-inl.hh

src/common_cpp/Converter/ConverterFactory.hh

src/common_cpp/Converter/DataConverters/PrimitiveConverters.hh

src/common_cpp/DataStructure/Data.hh

src/common_cpp/Optics/PolynomialOpticsModel.cc

src/common_cpp/Optics/TransferMapOpticsModel.cc

src/common_cpp/Recon/SciFi/RealDataDigitization.cc

src/common_cpp/Recon/SciFi/RealDataDigitization.hh

src/common_cpp/Utils/DAQChannelMap.cc

src/common_cpp/Utils/DAQChannelMap.hh

src/common_cpp/Utils/KLChannelMap.hh

src/common_cpp/Utils/PyObjectWrapper-inl.hh

src/common_cpp/Utils/PyObjectWrapper.hh

src/common_cpp/Utils/VersionNumber.hh

src/common_py/ConfigurationDefaults.py

src/common_py/Go.py

src/common_py/calibration/get_tof_calib.py

src/common_py/framework/utilities.py

src/common_py/geometry/CADModuleExtraction.py

src/common_py/geometry/ConfigReader.py

src/common_py/geometry/GDMLFormatter.py

src/common_py/geometry/GDMLtoCDB.py

src/common_py/geometry/xsltScripts/ParentFileCreation.xsl

src/common_py/geometry/xsltScripts/ParentFileTranlsation.xsl

src/common_py/geometry/xsltScripts/ParentFileTranslation.xsl

src/input/InputCppDAQData/InputCppDAQData.cc

src/input/InputCppDAQData/InputCppDAQData.hh

src/input/InputCppDAQData/UnpackEventLib.cc

src/input/InputCppDAQData/UnpackEventLib.hh

src/input/InputCppDAQOfflineData/test_InputCppDAQOfflineData.py

src/legacy/BeamTools/BTFieldConstructor.cc

src/legacy/FILES/Models/Configurations/Test.dat

src/map/MapCppEMRRecon/MapCppEMRRecon.cc

src/map/MapCppTOFSpacePoints/MapCppTOFSpacePoints.cc

src/map/MapCppTrackerDigits/MapCppTrackerDigits.cc

src/map/MapCppTrackerDigits/MapCppTrackerDigits.hh

src/map/MapCppTrackerRecon/MapCppTrackerRecon.cc

src/output/OutputCppRoot/OutputCppRoot.cc

src/output/OutputCppRoot/OutputCppRoot.hh

src/output/OutputCppRoot/test_output_cpp_root.py

src/py_cpp/PyConverter.cc

src/py_cpp/PyConverter.hh

src/py_cpp/PyField.cc

src/py_cpp/README

src/reduce/ReduceCppTofCalib/ReduceCppTofCalib.cc

src/reduce/ReducePyKLPlot/test_ReducePyKLPlot.py

switch_unpacker.bash

tests/build_release.py

tests/cpp_unit/API/OutputBaseTest.cc

tests/cpp_unit/BeamTools/BTFieldConstructorTest.cc

tests/cpp_unit/Converter/ConverterFactoryTest.cc

tests/cpp_unit/Optics/PolynomialOpticsModelTest.cc

tests/cpp_unit/Recon/SciFi/RealDataDigitizationTest.cc

tests/cpp_unit/Utils/PyObjectWrapperTest.cc

tests/py_unit/test_maus_cpp/test_converter.py

tests/py_unit/test_maus_cpp/test_field.py

third_party/bash/01python.bash

third_party/bash/02swig.bash

third_party/bash/11gtest.bash

third_party/bash/20gsl.bash

third_party/bash/21root.bash

third_party/bash/28xercesc.bash

third_party/bash/29expat.bash

third_party/bash/32clhep2.1.1.0.bash

third_party/bash/42libxml2.bash

third_party/bash/43libxslt.bash

third_party/bash/53unpacking.bash

third_party/bash/54flex.bash

third_party/bash/55doxygen.bash

third_party/bash/81G4beamline.bash

third_party/build_all.bash

third_party/install_build_test_daq.bash

Show diffs side-by-side

added added

removed removed

bin/analyze_data_offline.py

bin/examples/load_root_file_cpp/Makefile

bin/examples/simple_scalers_example.py

bin/utilities/download_geometry.py

doc/doc_src/introduction.tex

doc/doc_src/mice_modules/mice_module_fields.tex

doc/maus_user_guide.pdf

files/cabling/DAQChannelMap.txt

files/cabling/DAQChannelMap_preRun6541.txt

install_build_test.bash

src/common_cpp/API/OutputBase-inl.hh

src/common_cpp/API/OutputBase.hh

src/common_cpp/API/PyWrapOutputBase-inl.hh

src/common_cpp/API/PyWrapOutputBase.hh

src/common_cpp/Converter/ConverterFactory-inl.hh

src/common_cpp/Converter/ConverterFactory.hh

src/common_cpp/Converter/DataConverters/PrimitiveConverters.hh

src/common_cpp/Converter/DataConverters/PrimitiveConvertersData.hh

src/common_cpp/Converter/DataConverters/PrimitiveConvertersJobFooter.hh

src/common_cpp/Converter/DataConverters/PrimitiveConvertersJobHeader.hh

src/common_cpp/Converter/DataConverters/PrimitiveConvertersRunFooter.hh

src/common_cpp/Converter/DataConverters/PrimitiveConvertersRunHeader.hh

src/common_cpp/DataStructure/Data.hh

src/common_cpp/Optics/PolynomialOpticsModel.cc

src/common_cpp/Optics/TransferMapOpticsModel.cc

src/common_cpp/Recon/SciFi/RealDataDigitization.cc

src/common_cpp/Recon/SciFi/RealDataDigitization.hh

src/common_cpp/Utils/DAQChannelMap.cc

src/common_cpp/Utils/DAQChannelMap.hh

src/common_cpp/Utils/KLChannelMap.hh

src/common_cpp/Utils/PyObjectWrapper-inl.hh

src/common_cpp/Utils/PyObjectWrapper.hh

src/common_cpp/Utils/VersionNumber.hh

src/common_py/ConfigurationDefaults.py

src/common_py/Go.py

src/common_py/calibration/get_tof_calib.py

src/common_py/framework/utilities.py

src/common_py/geometry/CADModuleExtraction.py

src/common_py/geometry/ConfigReader.py

src/common_py/geometry/GDMLFormatter.py

src/common_py/geometry/GDMLtoCDB.py

src/common_py/geometry/xsltScripts/ParentFileCreation.xsl

src/common_py/geometry/xsltScripts/ParentFileTranlsation.xsl

src/common_py/geometry/xsltScripts/ParentFileTranslation.xsl

src/input/InputCppDAQData/InputCppDAQData.cc

src/input/InputCppDAQData/InputCppDAQData.hh

src/input/InputCppDAQData/UnpackEventLib.cc

src/input/InputCppDAQData/UnpackEventLib.hh

src/input/InputCppDAQOfflineData/test_InputCppDAQOfflineData.py

src/legacy/BeamTools/BTFieldConstructor.cc

src/legacy/FILES/Models/Configurations/Test.dat

src/map/MapCppEMRRecon/MapCppEMRRecon.cc

src/map/MapCppTOFSpacePoints/MapCppTOFSpacePoints.cc

src/map/MapCppTrackerDigits/MapCppTrackerDigits.cc

src/map/MapCppTrackerDigits/MapCppTrackerDigits.hh

src/map/MapCppTrackerRecon/MapCppTrackerRecon.cc

src/output/OutputCppRoot/OutputCppRoot.cc

src/output/OutputCppRoot/OutputCppRoot.hh

src/output/OutputCppRoot/OutputCppRoot.i

src/output/OutputCppRoot/test_output_cpp_root.py

src/py_cpp/PyConverter.cc

src/py_cpp/PyConverter.hh

src/py_cpp/PyField.cc

src/py_cpp/README

src/reduce/ReduceCppTofCalib/ReduceCppTofCalib.cc

src/reduce/ReducePyKLPlot/test_ReducePyKLPlot.py

switch_unpacker.bash

tests/build_release.py

tests/cpp_unit/API/OutputBaseTest.cc

tests/cpp_unit/BeamTools/BTFieldConstructorTest.cc

tests/cpp_unit/Converter/ConverterFactoryTest.cc

tests/cpp_unit/Optics/PolynomialOpticsModelTest.cc

tests/cpp_unit/Recon/SciFi/RealDataDigitizationTest.cc

tests/cpp_unit/Utils/PyObjectWrapperTest.cc

tests/py_unit/test_maus_cpp/test_converter.py

tests/py_unit/test_maus_cpp/test_field.py

third_party/bash/01python.bash

third_party/bash/02swig.bash

third_party/bash/11gtest.bash

third_party/bash/20gsl.bash

third_party/bash/21root.bash

third_party/bash/28xercesc.bash

third_party/bash/29expat.bash

third_party/bash/30clhep.bash

third_party/bash/32clhep2.1.1.0.bash

third_party/bash/42libxml2.bash

third_party/bash/43libxslt.bash

third_party/bash/53unpacking.bash

third_party/bash/54flex.bash

third_party/bash/55doxygen.bash

third_party/bash/81G4beamline.bash

third_party/build_all.bash

third_party/install/etc/

third_party/install_build_test_daq.bash

third_party/source/root_v5.34.07.source.tar.gz.md5

third_party/source/root_v5.34.30.source.tar.gz.md5

Older »