GitLab

modified:   ../Classic/AbsBeamline/Cyclotron.cpp
modified:   ../Classic/AbsBeamline/Cyclotron.h

This reverts commit 69985bb1.

fix issue #110 cyclotron trim coils: fix unit conversion and correct (invert) meaning of slope parameter; calculate influence for every radius; cpu optimisation of method (main improvement by removing of pow call); also some spacing and spelling

convert radii in trim coils from mm to m; for the user doesn't change anything except that I deleted the redundancy of the attributes TCR1/TCR1V etc: the names are TCR1, TCR2, SLPTC, MBTC but they're arrays

modified:   BeamBeam.cpp
modified:   BeamBeam.h
modified:   Bend.cpp
modified:   Bend.h
modified:   Collimator.cpp
modified:   Collimator.h
modified:   Component.cpp
modified:   Component.h
modified:   Corrector.cpp
modified:   Corrector.h
modified:   Cyclotron.cpp
modified:   Cyclotron.h
modified:   CyclotronValley.cpp
modified:   CyclotronValley.h
modified:   Degrader.cpp
modified:   Degrader.h
modified:   Diagnostic.cpp
modified:   Diagnostic.h
modified:   Drift.cpp
modified:   Drift.h
modified:   Integrator.h
modified:   Lambertson.cpp
modified:   Lambertson.h
modified:   Marker.cpp
modified:   Marker.h
modified:   Monitor.cpp
modified:   Monitor.h
modified:   Multipole.cpp
modified:   Multipole.h
modified:   Offset.cpp
modified:   Offset.h
modified:   ParallelPlate.cpp
modified:   ParallelPlate.h
modified:   Patch.cpp
modified:   Patch.h
modified:   Probe.cpp
modified:   Probe.h
modified:   RBend.cpp
modified:   RBend3D.cpp
modified:   RBend3D.h
modified:   RFCavity.cpp
modified:   RFCavity.h
modified:   RFQuadrupole.cpp
modified:   RFQuadrupole.h
modified:   Ring.cpp
modified:   Ring.h
modified:   SBend.cpp
modified:   SBend3D.cpp
modified:   SBend3D.h
modified:   SectorFieldMapComponent.h
modified:   Separator.cpp
modified:   Separator.h
modified:   Septum.cpp
modified:   Septum.h
modified:   Solenoid.cpp
modified:   Solenoid.h
modified:   Source.cpp
modified:   Source.h
modified:   Stripper.cpp
modified:   Stripper.h
modified:   TravelingWave.cpp
modified:   TravelingWave.h
modified:   VariableRFCavity.cpp
modified:   VariableRFCavity.h

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!

- 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

moving Classic into src directory and pack all objects into libOpal since Classic also depends on libOpal

Add std:vector of bool to indicate which of the feildmaks are supperposed (contributed by H. Zhang PSI

A loss LossDataSink is initiated with the constructor, then particles are added (and locally stored).
In the finalize method all data is written to an ASCII or H5 file, depending on the NEW option ASCIIDUMP.

Testing of this is ongoing, there are maybe some gliches, watch out. 

Regressiontest will follow!

@Yianjun: please test the CYCLOTRON related PROBES and STRIPPER element!

		MINR, MAXR, MINZ, MAXZ. 
- if a particle is out of cyclotron aperture or out of the field map, 
   it will be deleted after this step and its parameters are recorded in the *.loss file
- change data type of particle id from int to size_t
- many minor cosmetics of display massage

    - removing unused file
    - moved fieldlayout, mesh and layout to OpalData
    - started using smart pointers, removed lots of issues with destructors

add a parameter SUPERPOSE for CYCLOTRON element to determine whether all the 3D electric field maps should be superposed (true) or only one is used for any position(false). If it is false, the priorty of the field maps is determined by the sequence in RFMAPFNvector, i.e. the first one has highest priorty. This parameter is only for the TYPE=BANRF