GitLab

Merge branch '402-vffa' of gitlab.psi.ch:OPAL/src into origin/402-vffa - implement VFFA analytical field model.

This reverts commit 5fbd4c4b.

MultipoleT now converges for curved magnets
MultipoleT is split into three derived classed and a base class

Further changes:
   - remove SIMTMPDIR attribute

modified:   src/OpalConfigure/Configure.cpp
modified:   src/Sample/CMakeLists.txt
modified:   src/Sample/OpalSample.cpp
modified:   src/Sample/OpalSample.h
modified:   src/Sample/SampleCmd.cpp

deleted:    src/Sample/SequenceSampleCmd.cpp
deleted:    src/Sample/SequenceSampleCmd.h

renaming Collimator to CCollimator where C stands for cyclotron; all other collimators are implemented using FlexibleCollimator; This also fixes #224

first version of multi-slit/pepperpot/what ever aka flexible collimator. However way to slow to be practical

This reverts commit 69985bb1.

fix compiler warnings for missing declarations: put functions in anonymous namespaces; add header includes

Fixes #56 - OpalRing components throw segmentation fault and #59 - Unit tests throw segmentation fault; partial implementation of #68 DumpEmFields

ParallelTTracker. Particle-Matter interaction doesn't work either at the moment.

I hope that I didn't create too much of a mess when merging!

OpalData *OPAL = OpalData::getInstance();
OpalData *opal = OpalData::getInstance();

This change applies to following files:

modified:   src/AbstractObjects/BeamSequence.cpp
modified:   src/AbstractObjects/Element.cpp
modified:   src/Main.cpp
modified:   src/Match/MatchParser.cpp
modified:   src/OpalConfigure/Configure.cpp
modified:   src/Solvers/P3MPoissonSolver.cpp
modified:   src/Structure/H5PartWrapperForPS.cpp
modified:   src/Structure/H5PartWrapperForPT.cpp
modified:   src/ValueDefinitions/RealConstant.cpp
modified:   src/ValueDefinitions/StringConstant.cpp
modified:   src/opal.cpp