GitLab

Add std:: to a bunch of string statements.

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

    - 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

Merge branch 'develop' into svn: the same as for commit to r13629 applied to the changes commited in r13628

- 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 :-)