← Back to branch summary

~christopher-hunt08/maus/maus_integrated_kalman

~christopher-hunt08/maus/maus_integrated_kalman

« back to all changes in this revision

Viewing changes to src/common_cpp/Recon/Global/TrackMatching.cc

Committer: Durga Rajaram
Date: 2014-07-16 15:13:05 UTC
mfrom: (659.1.92 cand)
Revision ID: durga@fnal.gov-20140716151305-q27rv1y9p03v9lks

Tags: MAUS-v0.9, MAUS-v0.9.0

MAUS-v0.9.0

files added:
bin/user/scifi/cpp/scifi_analysis.cc

bin/user/scifi/cpp/scifi_momentum_analysis.cc

doc/doc_src/detectors/tracker/08-MonteCarlo

doc/doc_src/detectors/tracker/08-MonteCarlo/08-MonteCarlo.tex

doc/doc_src/reconstruction/globalpid

doc/doc_src/reconstruction/globalpid/PDFflow.pdf

doc/doc_src/reconstruction/globalpid/PIDflow.pdf

doc/doc_src/reconstruction/globalpid/globalpid.log

doc/doc_src/reconstruction/globalpid/globalpid.tex

doc/doc_src/reconstruction/globalpid/pdfflow.dot

doc/doc_src/reconstruction/globalpid/pdfprodflow.dot

doc/doc_src/reconstruction/globalpid/pdfprodflow.pdf

doc/doc_src/reconstruction/globalpid/pidflow.dot

doc/doc_src/reconstruction/globalpid/pidperfflow.dot

doc/doc_src/reconstruction/globalpid/pidperfflow.pdf

doc/doc_src/reconstruction/globalpid/tofplot.jpg

doc/doc_src/reconstruction/globalpid/toftrackerplot.jpg

files/calibration/klcalib.txt

src/common_cpp/API/APIExceptions.cc

src/common_cpp/API/PyWrapInputBase-inl.hh

src/common_cpp/API/PyWrapInputBase.hh

src/common_cpp/API/PyWrapInputBaseEmitter.hh

src/common_cpp/Plotting/SciFi/TrackerDataAnalyserMomentum.cc

src/common_cpp/Plotting/SciFi/TrackerDataAnalyserMomentum.hh

src/common_cpp/Recon/Global/ImportCkovRecon.cc

src/common_cpp/Recon/Global/ImportCkovRecon.hh

src/common_cpp/Recon/Global/ImportKLRecon.cc

src/common_cpp/Recon/Global/ImportKLRecon.hh

src/common_cpp/Utils/KLCalibrationMap.cc

src/common_cpp/Utils/KLCalibrationMap.hh

src/common_py/calibration/get_kl_calib.py

src/map/MapCppKLMCDigitizer/mc_test.dat

src/map/MapCppKLMCDigitizer/test_MapCppKLMCDigitizer.py

src/map/MapCppTrackerMCDigitization/MapCppTrackerMCDigitizationTest.dat

tests/cpp_unit/DataStructure/SciFiTrackPointTest.cc

tests/integration/test_scifi/test_scifi_recon_straight

tests/integration/test_scifi/test_scifi_recon_straight/datacard_mc_straight

tests/integration/test_scifi/test_scifi_recon_straight/simulate_scifi.py

tests/integration/test_scifi/test_scifi_recon_straight/test_scifi_recon_straight.py

tests/py_unit/test_geometry/test_gdml_to_maus_module.py

tests/py_unit/test_maus_cpp/test_converter_regression.json

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

files removed:
bin/Global/Documentation

bin/Global/Documentation/PDFflow.pdf

bin/Global/Documentation/PIDdocumentation.pdf

bin/Global/Documentation/PIDflow.pdf

bin/Global/Documentation/documentation.tex

bin/Global/Documentation/pdfprodflow.pdf

bin/Global/Documentation/pidperfflow.pdf

src/input/InputCppDAQData/InputCppDAQData.i

src/input/InputCppDAQOfflineData/InputCppDAQOfflineData.i

src/input/InputCppDAQOnlineData/InputCppDAQOnlineData.i

src/input/InputCppRoot/InputCppRoot.i

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

tests/py_unit/test_geometry/test_gdml_to_maus_module.bak

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

tests/integration/test_scifi/test_scifi_recon/ => tests/integration/test_scifi/test_scifi_recon_helical/

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

files modified:
.bzrignore

Makefile

README

RELEASENOTES

bin/Global/GlobalPID.py

bin/Global/datacard_200MeV_pi_plus_PID.py

bin/simulate_mice.py

bin/user/scifi/cpp/Makefile

bin/user/scifi/datacard_mc_helical

bin/user/scifi/datacard_mc_straight

bin/user/scifi/simulate_scifi.py

doc/doc_src/detectors/tracker.tex

doc/doc_src/detectors/tracker/06-CodeDesign/06-CodeDesign.tex

doc/doc_src/maus_user_guide.tex

doc/maus_user_guide.pdf

install_build_test.bash

src/common_cpp/API/APIExceptions.hh

src/common_cpp/API/IInput.hh

src/common_cpp/API/InputBase-inl.hh

src/common_cpp/API/InputBase.hh

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/Global/BasePoint.cc

src/common_cpp/DataStructure/Global/BasePoint.hh

src/common_cpp/DataStructure/Global/ReconEnums.hh

src/common_cpp/DataStructure/GlobalEvent.cc

src/common_cpp/DataStructure/SciFiBasePRTrack.cc

src/common_cpp/DataStructure/SciFiBasePRTrack.hh

src/common_cpp/DataStructure/SciFiCluster.cc

src/common_cpp/DataStructure/SciFiCluster.hh

src/common_cpp/DataStructure/SciFiDigit.cc

src/common_cpp/DataStructure/SciFiDigit.hh

src/common_cpp/DataStructure/SciFiEvent.cc

src/common_cpp/DataStructure/SciFiHelicalPRTrack.cc

src/common_cpp/DataStructure/SciFiHelicalPRTrack.hh

src/common_cpp/DataStructure/SciFiSpacePoint.cc

src/common_cpp/DataStructure/SciFiSpacePoint.hh

src/common_cpp/DataStructure/SciFiStraightPRTrack.cc

src/common_cpp/DataStructure/SciFiStraightPRTrack.hh

src/common_cpp/DataStructure/SciFiTrack.cc

src/common_cpp/DataStructure/SciFiTrack.hh

src/common_cpp/DataStructure/SciFiTrackPoint.cc

src/common_cpp/DataStructure/SciFiTrackPoint.hh

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/Common/ReferenceResolverJsonToCpp-inl.hh

src/common_cpp/JsonCppProcessors/DAQDataProcessor.cc

src/common_cpp/JsonCppProcessors/DAQDataProcessor.hh

src/common_cpp/JsonCppProcessors/Global/BasePointProcessor.cc

src/common_cpp/JsonCppProcessors/Global/BasePointProcessor.hh

src/common_cpp/JsonCppProcessors/SciFiClusterProcessor.cc

src/common_cpp/JsonCppProcessors/SciFiClusterProcessor.hh

src/common_cpp/JsonCppProcessors/SciFiDigitProcessor.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/SciFiTrackPointProcessor.cc

src/common_cpp/JsonCppProcessors/SciFiTrackPointProcessor.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/Plotting/SciFi/TrackerDataManager.cc

src/common_cpp/Plotting/SciFi/TrackerDataManager.hh

src/common_cpp/Plotting/SciFi/TrackerDataPlotterSZ.cc

src/common_cpp/Recon/Bayes/JointPDF.cc

src/common_cpp/Recon/Bayes/JointPDF.hh

src/common_cpp/Recon/Bayes/PDF.cc

src/common_cpp/Recon/Bayes/PDF.hh

src/common_cpp/Recon/Global/DataStructureHelper.cc

src/common_cpp/Recon/Global/ImportSciFiRecon.cc

src/common_cpp/Recon/Global/ImportSciFiRecon.hh

src/common_cpp/Recon/Global/ImportTOFRecon.hh

src/common_cpp/Recon/Global/PIDBase.hh

src/common_cpp/Recon/Global/PIDBase1D.hh

src/common_cpp/Recon/Global/PIDBase2D.hh

src/common_cpp/Recon/Global/PIDVarA.hh

src/common_cpp/Recon/Global/PIDVarB.hh

src/common_cpp/Recon/Global/TrackMatching.cc

src/common_cpp/Recon/Global/TrackMatching.hh

src/common_cpp/Recon/Kalman/KalmanHelicalPropagator.cc

src/common_cpp/Recon/Kalman/KalmanPropagator.cc

src/common_cpp/Recon/Kalman/KalmanSeed.cc

src/common_cpp/Recon/Kalman/KalmanSeed.hh

src/common_cpp/Recon/Kalman/KalmanState.cc

src/common_cpp/Recon/Kalman/KalmanState.hh

src/common_cpp/Recon/Kalman/KalmanTrackFit.cc

src/common_cpp/Recon/Kalman/KalmanTrackFit.hh

src/common_cpp/Recon/SciFi/LeastSquaresFitter.cc

src/common_cpp/Recon/SciFi/LeastSquaresFitter.hh

src/common_cpp/Recon/SciFi/PatternRecognition.cc

src/common_cpp/Recon/SciFi/PatternRecognition.hh

src/common_cpp/Recon/SciFi/RealDataDigitization.cc

src/common_cpp/Recon/SciFi/RealDataDigitization.hh

src/common_cpp/Recon/SciFi/SciFiGeometryHelper.cc

src/common_cpp/Recon/SciFi/SciFiGeometryHelper.hh

src/common_cpp/Recon/SciFi/SciFiSpacePointRec.cc

src/common_cpp/Recon/SciFi/SciFiTools.cc

src/common_cpp/Recon/SciFi/SciFiTools.hh

src/common_cpp/Simulation/MAUSEventAction.cc

src/common_cpp/Simulation/MAUSGeant4Manager.cc

src/common_cpp/Simulation/MAUSGeant4Manager.hh

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/MAUSEvaluator.cc

src/common_cpp/Utils/PyObjectWrapper-inl.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_cpp/Utils/VersionNumber.hh

src/common_py/ConfigurationDefaults.py

src/common_py/ErrorHandler.py

src/common_py/Go.py

src/common_py/framework/input_transform.py

src/common_py/framework/single_thread.py

src/common_py/framework/workers.py

src/common_py/geometry/CADImport.py

src/common_py/geometry/GDMLtoMAUSModule.py

src/common_py/geometry/xsltScripts/MMTranslation.xsl

src/common_py/geometry/xsltScripts/ParentFileTranlsation.xsl

src/common_py/mauscelery/state.py

src/common_py/mauscelery/tasks.py

src/input/InputCppDAQData/InputCppDAQData.cc

src/input/InputCppDAQData/InputCppDAQData.hh

src/input/InputCppDAQData/test_InputCppDAQData.py

src/input/InputCppDAQOfflineData/InputCppDAQOfflineData.cc

src/input/InputCppDAQOfflineData/InputCppDAQOfflineData.hh

src/input/InputCppDAQOfflineData/test_InputCppDAQOfflineData.py

src/input/InputCppDAQOnlineData/InputCppDAQOnlineData.cc

src/input/InputCppDAQOnlineData/InputCppDAQOnlineData.hh

src/input/InputCppDAQOnlineData/test_InputCppDAQOnlineData_old

src/input/InputCppRoot/InputCppRoot.cc

src/input/InputCppRoot/InputCppRoot.hh

src/input/InputCppRoot/test_InputCppRoot.py

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

src/legacy/FILES/Models/Modules/Tracker/TrackerSolenoid0_ST.dat

src/legacy/FILES/Models/Modules/Tracker/TrackerSolenoid1_ST.dat

src/legacy/Simulation/FillMaterials.cc

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/invalid_logL.json

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/MapCppGlobalTrackMatching.cc

src/map/MapCppGlobalTrackMatching/MapCppGlobalTrackMatching.hh

src/map/MapCppGlobalTrackMatching/global_tm_test.json

src/map/MapCppGlobalTrackMatching/test_MapCppGlobalTrackMatching.py

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/maus_output.json

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/MapCppTrackerRecon/test_helical_digits.json

src/map/MapCppTrackerRecon/test_straight_digits.json

src/map/MapPyBeamMaker/test_MapPyBeamMaker.py

src/map/MapPyGroup/MapPyGroup.py

src/map/MapPyGroup/test_MapPyGroup.py

src/map/MapPyTestMap/MapPyTestMap.py

src/reduce/ReduceCppGlobalPID/PDF_test.json

src/reduce/ReduceCppGlobalPID/ReduceCppGlobalPID.hh

src/reduce/ReduceCppGlobalPID/test_ReduceCppGlobalPID.py

src/reduce/ReducePyCkovPlot/ReducePyCkovPlot.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/build_release.py

tests/cpp_unit/API/InputBaseTest.cc

tests/cpp_unit/DataStructure/SciFiEventTest.cc

tests/cpp_unit/DataStructure/SciFiHelicalPRTrackTest.cc

tests/cpp_unit/DataStructure/SciFiSpacePointTest.cc

tests/cpp_unit/DataStructure/SciFiStraightPRTrackTest.cc

tests/cpp_unit/JsonCppProcessors/ArrayProcessorsTest.cc

tests/cpp_unit/Plotting/SciFi/TrackerDataManagerTest.cc

tests/cpp_unit/Recon/Bayes/JointPDFTest.cc

tests/cpp_unit/Recon/Global/DataStructureHelperTest.cc

tests/cpp_unit/Recon/Global/PIDVarBTest.cc

tests/cpp_unit/Recon/Kalman/KalmanSeedTest.cc

tests/cpp_unit/Recon/SciFi/LeastSquaresFitterTest.cc

tests/cpp_unit/Recon/SciFi/PatternRecognitionTest.cc

tests/cpp_unit/Simulation/MAUSGeant4ManagerTest.cc

tests/cpp_unit/Simulation/VirtualPlaneTest.cc

tests/cpp_unit/Utils/CppErrorHandlerTest.cc

tests/cpp_unit/Utils/PyObjectWrapperTest.cc

tests/integration/test_analyze_data_online/reference_plots_04235.000/imageReducePyCkovPlot.root

tests/integration/test_analyze_data_online/test_analyze_data_online.py

tests/integration/test_distributed_processing/test_celery.py

tests/integration/test_load/process_monitor.py

tests/integration/test_load/test_load.py

tests/integration/test_xboa/test_xboa.py

tests/py_unit/test_error_handler.py

tests/py_unit/test_maus_cpp/test_converter.py

tests/py_unit/test_mauscelery/test_mausprocess.py

tests/py_unit/test_mauscelery/test_state.py

tests/style/ref-pylint.json

third_party/bash/52jsoncpp.bash

Show diffs side-by-side

added added

removed removed

src/common_cpp/Recon/Global/TrackMatching.cc

72

72

MAUS::DataStructure::Global::TrackPoint* tempTOFTrackPoint =

73

73

const_cast<MAUS::DataStructure::Global::TrackPoint*>

74

74

(tempTOFTrackPointArray[k]);

75

tempTOFTrackPoint->set_mapper_name(mapper_name);

75

76

GlobalTrack->AddTrackPoint(tempTOFTrackPoint);

76

77

}

77

78

for (unsigned int k = 0; k < tempSciFiTrackPointArray.size(); k++) {

Older »