Merge branch 'develop' into svn
- moving the following classes over from OPAL to CLASSIC o OpalField -> ClassicField o OpalRing -> Ring o OpalRingSection -> RingSection o LossDataSink - clean up - splitting Options into classic and opal options
Showing
- .gitattributes 17 additions, 12 deletions.gitattributes
- CMakeLists.txt 25 additions, 1 deletionCMakeLists.txt
- classic/5.0/src/AbsBeamline/BeamlineVisitor.h 3 additions, 3 deletionsclassic/5.0/src/AbsBeamline/BeamlineVisitor.h
- classic/5.0/src/AbsBeamline/CMakeLists.txt 5 additions, 4 deletionsclassic/5.0/src/AbsBeamline/CMakeLists.txt
- classic/5.0/src/AbsBeamline/Collimator.cpp 1 addition, 0 deletionsclassic/5.0/src/AbsBeamline/Collimator.cpp
- classic/5.0/src/AbsBeamline/Cyclotron.cpp 13 additions, 12 deletionsclassic/5.0/src/AbsBeamline/Cyclotron.cpp
- classic/5.0/src/AbsBeamline/Degrader.cpp 1 addition, 0 deletionsclassic/5.0/src/AbsBeamline/Degrader.cpp
- classic/5.0/src/AbsBeamline/Monitor.cpp 0 additions, 2 deletionsclassic/5.0/src/AbsBeamline/Monitor.cpp
- classic/5.0/src/AbsBeamline/Offset.cpp 7 additions, 7 deletionsclassic/5.0/src/AbsBeamline/Offset.cpp
- classic/5.0/src/AbsBeamline/Offset.h 5 additions, 5 deletionsclassic/5.0/src/AbsBeamline/Offset.h
- classic/5.0/src/AbsBeamline/Probe.cpp 1 addition, 0 deletionsclassic/5.0/src/AbsBeamline/Probe.cpp
- classic/5.0/src/AbsBeamline/Ring.cpp 105 additions, 107 deletionsclassic/5.0/src/AbsBeamline/Ring.cpp
- classic/5.0/src/AbsBeamline/Ring.h 68 additions, 69 deletionsclassic/5.0/src/AbsBeamline/Ring.h
- classic/5.0/src/AbsBeamline/Septum.cpp 1 addition, 2 deletionsclassic/5.0/src/AbsBeamline/Septum.cpp
- classic/5.0/src/AbsBeamline/Stripper.cpp 7 additions, 7 deletionsclassic/5.0/src/AbsBeamline/Stripper.cpp
- classic/5.0/src/AbsBeamline/VariableRFCavity.cpp 4 additions, 4 deletionsclassic/5.0/src/AbsBeamline/VariableRFCavity.cpp
- classic/5.0/src/Algorithms/AbstractTimeDependence.cpp 3 additions, 3 deletionsclassic/5.0/src/Algorithms/AbstractTimeDependence.cpp
- classic/5.0/src/Algorithms/DefaultVisitor.cpp 2 additions, 2 deletionsclassic/5.0/src/Algorithms/DefaultVisitor.cpp
- classic/5.0/src/Algorithms/DefaultVisitor.h 1 addition, 1 deletionclassic/5.0/src/Algorithms/DefaultVisitor.h
- classic/5.0/src/Algorithms/PartBunch.cpp 2 additions, 3 deletionsclassic/5.0/src/Algorithms/PartBunch.cpp
Loading
Please register or sign in to comment