GitLab

modified:   ClosedOrbitFinder.h
renamed:    CycMagneticField.cpp -> MagneticField.cpp
renamed:    CycMagneticField.h -> MagneticField.h

- fieldmap reader inherits from Classic/AbsBeamline/Cyclotron
- new OPAL input file attribute for computing matched distribution

modified:   src/Classic/AbsBeamline/Cyclotron.h
modified:   src/Distribution/ClosedOrbitFinder.h
modified:   src/Distribution/CycMagneticField.cpp
modified:   src/Distribution/CycMagneticField.h
modified:   src/Distribution/Distribution.cpp
modified:   src/Distribution/SigmaGenerator.h

modified:   CMakeLists.txt
modified:   ClosedOrbitFinder.h
copied:     CycMagneticField.h -> CycMagneticField.cpp
modified:   CycMagneticField.h
modified:   SigmaGenerator.h

- comment all parts where MagneticField.h (if no >= gsl/2.2.1)
- write also matched distributions to a file.

modified:   ClosedOrbitFinder.h
modified:   SigmaGenerator.h

Still ugly coding!

modified:   ClosedOrbitFinder.h
modified:   CycMagneticField.h

new file:   CycMagneticField.h
modified:   MagneticField.h
modified:   MapGenerator.h
modified:   SigmaGenerator.h

modified:   ClosedOrbitFinder.h
modified:   Distribution.cpp
deleted:    MagneticField.cpp
modified:   MagneticField.h
modified:   SigmaGenerator.h

modified:   ClosedOrbitFinder.h
new file:   MagneticField.cpp
modified:   MagneticField.h

modified:   Harmonics.h
modified:   SigmaGenerator.h
deleted:    math.h

Matthias: Remove math.h that just defined the sign function. It is replaced in SigmaGenerator.h and Harmonics.h. Update of exception-handling in ClosedOrbitFinder.h

modified:   src/Distribution/Distribution.cpp
modified:   src/Distribution/SigmaGenerator.h
deleted:    src/Distribution/error.h
deleted:    src/Distribution/physical_error.h

Matthias: Removal of unnessecary functions in matched distribution. Using OpalExceptions instead of standard exceptions.

Matthias: Add do-while loop again.

Matthias: Just divide by "acon" to get \beta\gamma units.

modified:   src/Distribution/SigmaGenerator.h

Matthias: Changed momentum from [m] (Gordong units) to [Beta Gamma].

modified:   src/Distribution/Harmonics.h
modified:   src/Distribution/SigmaGenerator.h
deleted:    src/Distribution/physics.h

Matthias: Usage of classic/5.0/src/Physics/Physics.h instead of src/Distribution/physics.s in Distribution/SigmaGenerator.h
and Distribution/ClosedOrbitFinder.h

Matthias: Generalized the potential energy. Now, the matched distribution of other particle types possible.

please note: IN C++ DEFAULT VALUES HAVE TO BE DEFINED IN THE DECLARATION OF A FUNCTION, NOT IN THE DEFINITION

azimutes other than zero

matched distribution the CARBONCYCL type has to be used. For example the PSI Ring 
header would look like: 

1800.0
20.0
8
-4.0
1440
141
......

Important: the third line describes the number of sectors AND is not 
specified in the original definition of the CARBONCYCL type. THIS needs to be 
fixed as soon as the matched distribution is working properly.

At the moment the correct sigma matrix will be produced only with the ring590_bfld.dat:

 3.859  -0.6331 0     0	     0.4538 1.324

-0.6331  0.636  0     0      0.7276 -0.2605

 0	 0      6.256 1.197  0	     0

 0	 0      1.197 0.3845 0	     0

 0.4538  0.7276 0     0	     2.396   0.172

 1.324  -0.2605 0     0	     0.172   0.8693

Check at svn+ssh://savannah02.psi.ch/repos/opal/tests/trunk/RegressionTests/RingCyclotronMatched

No commit message

Not yet in operation and some of the headerfiles need to be
cleaned up. Need to remove physics.h.

At the moment the matched distribution generator is not enabled!