Merge branch 'energy_attribute' into 'devel'
Energy attribute See merge request !1
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- EbsMagnet/EbsMagnet.cpp 126 additions, 62 deletionsEbsMagnet/EbsMagnet.cpp
- EbsMagnet/EbsMagnet.h 67 additions, 39 deletionsEbsMagnet/EbsMagnet.h
- EbsMagnet/EbsMagnet.xmi 14 additions, 1 deletionEbsMagnet/EbsMagnet.xmi
- EbsMagnet/EbsMagnetClass.cpp 188 additions, 110 deletionsEbsMagnet/EbsMagnetClass.cpp
- EbsMagnet/EbsMagnetClass.h 109 additions, 86 deletionsEbsMagnet/EbsMagnetClass.h
- EbsMagnet/EbsMagnetStateMachine.cpp 40 additions, 18 deletionsEbsMagnet/EbsMagnetStateMachine.cpp
- EbsMagnet/Magnet/Magnet.cpp 8 additions, 8 deletionsEbsMagnet/Magnet/Magnet.cpp
- doc/EbsMagnetElettra2.res 80 additions, 0 deletionsdoc/EbsMagnetElettra2.res
- doc/EbsPropertyElettra2.res 13 additions, 0 deletionsdoc/EbsPropertyElettra2.res
- doc/SimulatedMagnetChCLASS.res 7 additions, 0 deletionsdoc/SimulatedMagnetChCLASS.res
- doc/SimulatedMagnetPSElettra2.res 100 additions, 0 deletionsdoc/SimulatedMagnetPSElettra2.res
Please register or sign in to comment