← Back to branch summary

~chris-rogers/maus/1046_a

~chris-rogers/maus/1046_a

« back to all changes in this revision

Viewing changes to src/common_cpp/Utils/EMRChannelMap.cc

Committer: Chris Rogers
Date: 2014-06-03 10:13:52 UTC
mfrom: (732.1.3 merge)
Revision ID: chris.rogers@stfc.ac.uk-20140603101352-1axip820676885f9

Merge in trunk

files added:
src/map/MapCppGlobalTrackMatching/MapCppGlobalTrackMatching.i

src/map/MapCppTrackerMCDigitization/MapCppTrackerMCDigitizationTest.dat

tests/py_unit/test_maus_cpp/test_converter_regression.json

third_party/source/jsoncpp-src-0.6.0-rc2.tar.gz.md5

files removed:
src/map/MapCppEMRPlaneHits/MapCppEMRPlaneHits.i

src/map/MapCppGlobalPID/MapCppGlobalPID.i

src/map/MapCppGlobalReconImport/MapCppGlobalReconImport.i

src/map/MapCppGlobalTrackMatching/MapCppGlobalTrackMatching.i

src/map/MapCppKLCellHits/MapCppKLCellHits.i

src/map/MapCppKLDigits/MapCppKLDigits.i

src/map/MapCppKLMCDigitizer/MapCppKLMCDigitizer.i

src/map/MapCppPrint

src/map/MapCppPrint/MapCppPrint.cc

src/map/MapCppPrint/MapCppPrint.hh

src/map/MapCppPrint/MapCppPrint.i

src/map/MapCppPrint/sconscript

src/map/MapCppPrint/test_MapCppPrint.py

src/map/MapCppSimulation/MapCppSimulation.i

src/map/MapCppTOFDigits/MapCppTOFDigits.i

src/map/MapCppTOFMCDigitizer/MapCppTOFMCDigitizer.i

src/map/MapCppTOFSlabHits/MapCppTOFSlabHits.i

src/map/MapCppTOFSpacePoints/MapCppTOFSpacePoints.i

src/map/MapCppTrackerDigits/MapCppTrackerDigits.i

src/map/MapCppTrackerMCDigitization/MapCppTrackerMCDigitization.i

src/map/MapCppTrackerMCNoise/MapCppTrackerMCNoise.i

src/map/MapCppTrackerRecon/MapCppTrackerRecon.i

src/map/Templates

src/map/Templates/MapCppTemplate.py

files renamed:
src/map/MapCppGlobalPID/noDataTest.txt => src/map/MapCppGlobalPID/noDataTest.json

tests/integration/test_scifi/test_scifi_recon/test_scifi_recon.py => tests/integration/test_scifi/test_scifi_recon/_test_scifi_recon.py

files modified:
src/common_cpp/API/MapBase-inl.hh

src/common_cpp/API/MapBase.hh

src/common_cpp/API/OutputBase-inl.hh

src/common_cpp/API/PyWrapMapBase-inl.hh

src/common_cpp/API/PyWrapMapBase.hh

src/common_cpp/DataStructure/GlobalEvent.cc

src/common_cpp/DataStructure/SciFiEvent.cc

src/common_cpp/DataStructure/Spill.cc

src/common_cpp/JsonCppProcessors/ArrayProcessors-inl.hh

src/common_cpp/JsonCppProcessors/Common/ReferenceResolverCppToJson-inl.hh

src/common_cpp/JsonCppProcessors/SciFiClusterProcessor.cc

src/common_cpp/JsonCppProcessors/SciFiHelicalPRTrackProcessor.cc

src/common_cpp/JsonCppProcessors/SciFiHelicalPRTrackProcessor.hh

src/common_cpp/JsonCppProcessors/SciFiSpacePointProcessor.cc

src/common_cpp/JsonCppProcessors/SciFiSpacePointProcessor.hh

src/common_cpp/JsonCppProcessors/SciFiStraightPRTrackProcessor.cc

src/common_cpp/JsonCppProcessors/SciFiStraightPRTrackProcessor.hh

src/common_cpp/JsonCppProcessors/SciFiTrackProcessor.cc

src/common_cpp/JsonCppProcessors/TRefArrayProcessor-inl.hh

src/common_cpp/Maths/Matrix.cc

src/common_cpp/Optics/PolynomialOpticsModel.cc

src/common_cpp/Optics/TransferMapOpticsModel.cc

src/common_cpp/Recon/Global/DataStructureHelper.cc

src/common_cpp/Recon/SciFi/RealDataDigitization.cc

src/common_cpp/Simulation/MAUSEventAction.cc

src/common_cpp/Simulation/MAUSTrackingAction.cc

src/common_cpp/Utils/CppErrorHandler.cc

src/common_cpp/Utils/EMRChannelMap.cc

src/common_cpp/Utils/EMRChannelMap.hh

src/common_cpp/Utils/JsonWrapper.cc

src/common_cpp/Utils/KLChannelMap.cc

src/common_cpp/Utils/KLChannelMap.hh

src/common_cpp/Utils/TOFCalibrationMap.cc

src/common_cpp/Utils/TOFCalibrationMap.hh

src/common_cpp/Utils/TOFChannelMap.cc

src/common_cpp/Utils/TOFChannelMap.hh

src/common_py/ErrorHandler.py

src/map/MapCppEMRPlaneHits/MapCppEMRPlaneHits.cc

src/map/MapCppEMRPlaneHits/MapCppEMRPlaneHits.hh

src/map/MapCppEMRPlaneHits/test_map_cpp_emr_plane_hits.py

src/map/MapCppExampleMAUSDataInput/MapCppExampleMAUSDataInput.cc

src/map/MapCppExampleMAUSDataInput/MapCppExampleMAUSDataInput.hh

src/map/MapCppGlobalPID/MapCppGlobalPID.cc

src/map/MapCppGlobalPID/MapCppGlobalPID.hh

src/map/MapCppGlobalPID/muon_pid_test.json

src/map/MapCppGlobalPID/pion_pid_test.json

src/map/MapCppGlobalPID/positron_pid_test.json

src/map/MapCppGlobalPID/test_MapCppGlobalPID.py

src/map/MapCppGlobalPID/undef_pid_test.json

src/map/MapCppGlobalReconImport/MapCppGlobalReconImport.cc

src/map/MapCppGlobalReconImport/MapCppGlobalReconImport.hh

src/map/MapCppGlobalReconImport/global_import_test.json

src/map/MapCppGlobalReconImport/test_MapCppGlobalReconImport.py

src/map/MapCppGlobalTrackMatching/global_tm_test.json

src/map/MapCppKLCellHits/MapCppKLCellHits.cc

src/map/MapCppKLCellHits/MapCppKLCellHits.hh

src/map/MapCppKLCellHits/test_MapCppKLCellHits.py

src/map/MapCppKLDigits/MapCppKLDigits.cc

src/map/MapCppKLDigits/MapCppKLDigits.hh

src/map/MapCppKLDigits/test_MapCppKLDigits.py

src/map/MapCppKLMCDigitizer/MapCppKLMCDigitizer.cc

src/map/MapCppKLMCDigitizer/MapCppKLMCDigitizer.hh

src/map/MapCppSimulation/MapCppSimulation.cc

src/map/MapCppSimulation/MapCppSimulation.hh

src/map/MapCppSimulation/run_visualisation_for_tests.py

src/map/MapCppSimulation/run_visualisation_vrml2file_no_event.py

src/map/MapCppSimulation/test_MapCppSimulation.py

src/map/MapCppTOFDigits/MapCppTOFDigits.cc

src/map/MapCppTOFDigits/MapCppTOFDigits.hh

src/map/MapCppTOFDigits/test_MapCppTOFDigits.py

src/map/MapCppTOFMCDigitizer/MapCppTOFMCDigitizer.cc

src/map/MapCppTOFMCDigitizer/MapCppTOFMCDigitizer.hh

src/map/MapCppTOFMCDigitizer/test_MapCppTOFMCDigitizer.py

src/map/MapCppTOFSlabHits/MapCppTOFSlabHits.cc

src/map/MapCppTOFSlabHits/MapCppTOFSlabHits.hh

src/map/MapCppTOFSlabHits/test_MapCppTOFSlabHits.py

src/map/MapCppTOFSpacePoints/MapCppTOFSpacePoints.cc

src/map/MapCppTOFSpacePoints/MapCppTOFSpacePoints.hh

src/map/MapCppTOFSpacePoints/test_MapCppTOFSpacePoints.py

src/map/MapCppTrackerDigits/MapCppTrackerDigits.cc

src/map/MapCppTrackerDigits/MapCppTrackerDigits.hh

src/map/MapCppTrackerDigits/lab7_unpacked

src/map/MapCppTrackerDigits/test_map_cpp_tracker_digits.py

src/map/MapCppTrackerMCDigitization/MapCppTrackerMCDigitization.cc

src/map/MapCppTrackerMCDigitization/MapCppTrackerMCDigitization.hh

src/map/MapCppTrackerMCDigitization/test_map_cpp_tracker_mc_digitization.py

src/map/MapCppTrackerMCNoise/MapCppTrackerMCNoise.cc

src/map/MapCppTrackerMCNoise/MapCppTrackerMCNoise.hh

src/map/MapCppTrackerMCNoise/test_map_cpp_tracker_mc_noise.py

src/map/MapCppTrackerRecon/MapCppTrackerRecon.cc

src/map/MapCppTrackerRecon/MapCppTrackerRecon.hh

src/map/MapCppTrackerRecon/test_MapCppTrackerRecon.py

src/map/MapPyBeamMaker/test_MapPyBeamMaker.py

src/map/MapPyCkov/MapPyCkov.py

src/map/MapPyGroup/MapPyGroup.py

src/map/MapPyGroup/test_MapPyGroup.py

src/reduce/ReducePyMatplotlibHistogram/test_ReducePyMatplotlibHistogram.py

src/reduce/ReducePyROOTHistogram/test_ReducePyROOTHistogram.py

src/reduce/ReducePyScalersTable/ReducePyScalersTable.py

src/reduce/ReducePyScalersTable/test_ReducePyScalersTable.py

tests/cpp_unit/JsonCppProcessors/ArrayProcessorsTest.cc

tests/cpp_unit/Simulation/MAUSGeant4ManagerTest.cc

tests/cpp_unit/Simulation/VirtualPlaneTest.cc

tests/cpp_unit/Utils/CppErrorHandlerTest.cc

tests/py_unit/test_error_handler.py

tests/py_unit/test_maus_cpp/test_converter.py

third_party/bash/52jsoncpp.bash

Show diffs side-by-side

added added

removed removed

src/common_cpp/Utils/EMRChannelMap.cc

66

66

67

67

void EMRChannelMap::InitFromCDB() {}

68

68

69

EMRChannelKey* EMRChannelMap::find(DAQChannelKey *daqKey) {

69

EMRChannelKey* EMRChannelMap::find(DAQChannelKey *daqKey) const {

70

70

for (unsigned int i = 0;i < _emrKey.size();i++) {

71

71

if ( _dbbKey[i]->eqType() == daqKey->eqType() &&

72

72

_dbbKey[i]->ldc() == daqKey->ldc() &&

Older »