← Back to branch summary

~vassil-verguilov/maus/emr-sprint

~vassil-verguilov/maus/emr-sprint

Viewing all changes in revision 425.

Committer: Vassil Verguilov
Date: 2011-06-12 15:02:53 UTC
mfrom: (416.1.137 maus)
Revision ID: vassil.verguilov@gmail.com-20110612150253-op0f9n84epbzte0x

More conflicts resolved

files added:
src/common_cpp/DetModel

files renamed:
src/legacy/DetModel/MAUSSD.cc => src/common_cpp/DetModel/MAUSSD.cc

src/legacy/DetModel/MAUSSD.hh => src/common_cpp/DetModel/MAUSSD.hh

files modified:
SConstruct

bin/simulate_mice.py

src/common_cpp/Simulation/VirtualPlanes.cc

src/legacy/DetModel/SciFi/SciFiSD.cc

src/legacy/DetModel/TOF/TofSD.cc

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

src/legacy/Simulation/MICEDetectorConstruction.cc

src/legacy/Simulation/MICEDetectorConstruction.hh

src/map/MapCppSimulation/MapCppSimulation.cc

src/map/MapPyValidateSpill/test_MapPyValidateSpill.py

src/output/OutputPyJSON/OutputPyJSON.py

src/output/OutputPyJSON/test_OutputPyJSON.py

third_party/bash/40python_extras.bash

Show diffs side-by-side

added added

removed removed

bin/simulate_mice.py

src/common_cpp/DetModel/

src/common_cpp/DetModel/MAUSSD.cc

src/common_cpp/DetModel/MAUSSD.hh

src/common_cpp/Simulation/VirtualPlanes.cc

src/legacy/DetModel/SciFi/SciFiSD.cc

src/legacy/DetModel/TOF/TofSD.cc

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

src/legacy/Simulation/MICEDetectorConstruction.cc

src/legacy/Simulation/MICEDetectorConstruction.hh

src/map/MapCppSimulation/MapCppSimulation.cc

src/map/MapPyValidateSpill/test_MapPyValidateSpill.py

src/output/OutputPyJSON/OutputPyJSON.py

src/output/OutputPyJSON/test_OutputPyJSON.py

third_party/bash/40python_extras.bash

Older »