← Back to branch summary

~jan.greis/maus/straighttemp

~jan.greis/maus/straighttemp

Viewing all changes in revision 818.

Committer: Jan Greis
Date: 2015-07-13 13:30:11 UTC
mfrom: (798.9.72 merge)
Revision ID: j.r.greis@warwick.ac.uk-20150713133011-7eslktnc50xn8yjn

Merge

files added:
files/cabling/scifi_mapping_2015-06-18.txt

files/calibration/scifi_calibration_2015-06-18.txt

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

files removed:
files/calibration/scifi_calibration_2015-06-16.txt

src/map/MapCppTrackerDigits/scifi_mapping_2015-06-16.txt

files renamed:
src/map/MapCppTrackerDigits/mapping_7.txt => files/cabling/scifi_mapping_7.txt

src/map/MapCppTrackerDigits/bad_chan_list.txt => files/calibration/scifi_bad_channels_2015-06-18.txt

files modified:
README

RELEASENOTES

doc/maus_user_guide.pdf

src/common_cpp/DataStructure/Data.cc

src/common_cpp/DataStructure/Data.hh

src/common_cpp/DataStructure/KLCellHit.cc

src/common_cpp/DataStructure/KLCellHit.hh

src/common_cpp/Globals/GlobalsManager.cc

src/common_cpp/JsonCppProcessors/KLCellHitProcessor.cc

src/common_cpp/JsonCppProcessors/KLCellHitProcessor.hh

src/common_cpp/Recon/Global/ImportKLRecon.cc

src/common_cpp/Recon/SciFi/RealDataDigitization.cc

src/common_cpp/Recon/SciFi/RealDataDigitization.hh

src/common_cpp/Utils/PyObjectWrapper-inl.hh

src/common_cpp/Utils/VersionNumber.hh

src/common_py/ConfigurationDefaults.py

src/input/InputCppDAQData/InputCppDAQData.hh

src/legacy/FILES/Models/Modules/KL/KLFiber.dat

src/map/MapCppGlobalPID/kl_pid_test.json

src/map/MapCppGlobalReconImport/global_import_test.json

src/map/MapCppGlobalReconImport/test_MapCppGlobalReconImport.py

src/map/MapCppKLCellHits/MapCppKLCellHits.cc

src/map/MapCppKLCellHits/MapCppKLCellHits.hh

src/map/MapCppTrackerDigits/MapCppTrackerDigits.cc

src/map/MapPyGroup/MapPyGroup.py

tests/cpp_unit/DataStructure/KLCellHitTest.cc

tests/cpp_unit/MAUSUnitTest.cc

tests/cpp_unit/Recon/SciFi/RealDataDigitizationTest.cc

tests/integration/test_analyze_offline/test_analyze_offline.py

third_party/bash/21root.bash

third_party/bash/53unpacking.bash

third_party/bash/71test_data.bash

Show diffs side-by-side

added added

removed removed

doc/maus_user_guide.pdf

files/cabling/scifi_mapping_2015-06-18.txt

files/calibration/scifi_calibration_2015-06-16.txt

files/calibration/scifi_calibration_2015-06-18.txt

src/common_cpp/DataStructure/Data.cc

src/common_cpp/DataStructure/Data.hh

src/common_cpp/DataStructure/KLCellHit.cc

src/common_cpp/DataStructure/KLCellHit.hh

src/common_cpp/Globals/GlobalsManager.cc

src/common_cpp/JsonCppProcessors/KLCellHitProcessor.cc

src/common_cpp/JsonCppProcessors/KLCellHitProcessor.hh

src/common_cpp/Recon/Global/ImportKLRecon.cc

src/common_cpp/Recon/SciFi/RealDataDigitization.cc

src/common_cpp/Recon/SciFi/RealDataDigitization.hh

src/common_cpp/Utils/PyObjectWrapper-inl.hh

src/common_cpp/Utils/VersionNumber.hh

src/common_py/ConfigurationDefaults.py

src/input/InputCppDAQData/InputCppDAQData.hh

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

src/legacy/FILES/Models/Modules/KL/KLFiber.dat

src/map/MapCppGlobalPID/kl_pid_test.json

src/map/MapCppGlobalReconImport/global_import_test.json

src/map/MapCppGlobalReconImport/test_MapCppGlobalReconImport.py

src/map/MapCppKLCellHits/MapCppKLCellHits.cc

src/map/MapCppKLCellHits/MapCppKLCellHits.hh

src/map/MapCppTrackerDigits/MapCppTrackerDigits.cc

src/map/MapCppTrackerDigits/scifi_mapping_2015-06-16.txt

src/map/MapPyGroup/MapPyGroup.py

tests/cpp_unit/DataStructure/KLCellHitTest.cc

tests/cpp_unit/MAUSUnitTest.cc

tests/cpp_unit/Recon/SciFi/RealDataDigitizationTest.cc

tests/integration/test_analyze_offline/test_analyze_offline.py

third_party/bash/21root.bash

third_party/bash/53unpacking.bash

third_party/bash/71test_data.bash

Older »