GitLab

 moving startTimer/stopTimer outside loop over particles and - avoiding string
 comparison inside loops over particles

Revert "In case a distribution has OFFSET, in OPAL-cycl the referernce particle has to be adjusted."

This reverts commit 20d8e10d.

Need this for OPAL-t, OPAL-cycl coupling in lieu of gantry simulations (Jozef).

Brought back saving in local frame for cyclotron tracker. Reverted the way mean E is calculated in PartBunch. Hopefully, restarts in local as well as in global frame now work in the cyclotron tracker.

- 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

- remove 'using namespace' from header files
- remove 'using std::string' and 'using std::abs' from header files

For reason see:
o http://stackoverflow.com/questions/5849457/using-namespace-in-c-headers

Fixed small issue with singleParticleDump not working correctly in CyclotronTracker in RK-4 mode, made combined LF-2/RK-4 tracker default

*) Fixed a problem with saving the lost particles if not all processors have lost particles. \n*) Consolidated Tracker_RK4 and Tracker_LF in ParallelCyclotronTracker. Enclosed in #ifdef for now. Activate by uncommenting #define GENERICTRACKER in ParallelCyclotronTracker.h. \n*) Added the general OPAL OPTION boundpdestroyfreq for Cyclotron Tracker.

Cosmetics, Typos and a bugfix in calculateBeamParameters_cycl() where the energy would always be 0 and thus the emittance inf

Major Changes: 1. No more dumping or restarting in LOCAL frame. 2. OPAL-CYCL now recalculates reference* variables before dump and saves in H5 file. 3. OPAL correctly reads reference* values and calculates beta*gamma correctly from Ekin (was factor 1000 wrong before) Note: Transformation of bunch data into local frame must now be done in POSTPROCESSING -> upgrade H5root

		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

    - simplify checkNumPart
    - clean up function initDistInGlobalFrame
          - correct indentation
          - move AUTO mode stuff down where meanR is calculated already
    - referenceR is not used in Tracker_MTS body, so remove it

    - Needed to add member variables turnnumber_m, eta_m

cleanup: merge the duplicate code of LF2 and RK4into a function initDistInGlobleFrame(), not used in MTS tracker since units are different

    - Different splitting allows any positive integer for MTSSUBSTEPS option
    - Requires still one space charge solve per step, but one additional
      solve before main loop. Therefore, extract code to function
      evaluateSpaceCharge
    - TODO: correct location of bunch injection code?

    - Only for Tracker_LF and Tracker_MTS so far, Tracker_RK4 seems
      to contain different/additional logic. This should be clarified
      such that all trackers can use the same single particle dump
      code.
    - Initialization of trackOrbit-file done in initTrackOrbitFile
    - outf stream renamend to outfTrackOrbit_m, is now member variable
    - method singleParticleDump does the actual dump

- remove virtual functions from Component class which are specific for the Cyclotron class, then, in ParallelCyclotronTracker, cast pointers to instances of Component appropriately
- remove unrecognised escape character

    - Additional method ParallelCyclotronTracker::Tracker_MTS
    - If successfully tested, it should replace Tracker_LF
    - Detailed description and sample input file will follow
    - Brief usage guide:
        - Use 'TIMEINTEGRATOR="MTS"' instead of 'TIMEINTEGRATOR="LF-2"'
        - The outer, large step is for integration of space charge, the substeps
          for everything else.
        - Define number of substeps per step with 'Option, MTSSUBSTEPS=10;'.
          This must be an even number >= 2.
        - The input file has to be rewritten in units of the large step, so
          divide STEPSPERTURN, PSDUMPFREQ (and others) by MTSSUBSTEPS to
          maintain similar behaviour.
        - MTSSUBSTEPS and SCSOLVEFREQ both describe the frequency of space
          charge solves compared to the basic step. However, MTSSUBSTEPS
          can be chosen larger while maintaining accuracy. Try it :-)