spelling fixes and add some comments

CMakeLists.txt

@@ -41,6 +41,7 @@ set (CMAKE_CXX_STANDARD 11)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 set (CMAKE_CXX_EXTENSIONS OFF)
 
+# Disable compile time assert (used by IPPL)
 add_definitions (-DNOCTAssert)
 
 add_compile_options (-Wall)
@@ -171,7 +172,7 @@ if (ENABLE_AMR)
 endif ()
 
 option (ENABLE_AMR_MG_SOLVER "Enable AMR MG solver" OFF)
-option (ENABLE_SAAMG_SOLVER "Enable iteartive SA-AMG-PCG self field solver" OFF)
+option (ENABLE_SAAMG_SOLVER "Enable iterative SA-AMG-PCG self field solver" OFF)
 if (ENABLE_SAAMG_SOLVER OR ENABLE_AMR_MG_SOLVER)
     #
     # :FIXME: We have to add checks whether the required Trilinos modules

CMakeModules/FindGTest.cmake

 #
 # Find gtest Google Test includes and library
 #
-# gtest
-# It can be found at:
-#     http://amas.web.psi.ch/tools/GSL/index.html
-#
 # GTEST_INCLUDE_DIR - where to find gtest/gtest.h
 # GTEST_LIBRARY     - libgtest.a path
 # GTEST_MAIN_LIBRARY     - libgtest_main.a path

src/Classic/AbsBeamline/RFCavity.cpp

@@ -180,7 +180,7 @@ void RFCavity::initialise(PartBunchBase<double, 3> *bunch, double &startField, d
     fieldmap_m->getFieldDimensions(startField_m, endField);
     if (endField <= startField_m) {
         throw GeneralClassicException("RFCavity::initialise",
-                                      "The length of the field map '" + filename_m + "' is zero or negativ");
+                                      "The length of the field map '" + filename_m + "' is zero or negative");
     }
 
     msg << level2 << getName() << " using file ";

src/Classic/AbsBeamline/TravelingWave.h

@@ -30,8 +30,8 @@ class Fieldmap;
 
 // Class TravelingWave
 // ------------------------------------------------------------------------
-/// Interface for RF cavity.
-//  Class TravelingWave defines the abstract interface for RF cavities.
+/// Interface for Traveling Wave.
+//  Class TravelingWave defines the abstract interface for Traveling Wave.
 
 
 class TravelingWave: public RFCavity {

src/Classic/Algorithms/Tracker.h

@@ -81,8 +81,8 @@ public:
     //  The beam line to be tracked is [b]bl[/b].
     //  The particle reference data are taken from [b]data[/b].
     //  The particle bunch is initially empty.
-    //  If [b]revBeam[/b] is true, the beam runs from s = C to s = 0.
-    //  If [b]revTrack[/b] is true, we track against the beam.
+    //  If [b]backBeam[/b] is true, the beam runs from s = C to s = 0.
+    //  If [b]backTrack[/b] is true, we track against the beam.
     Tracker(const Beamline &, const PartData &,
             bool backBeam, bool backTrack);
 
@@ -90,8 +90,8 @@ public:
     //  The beam line to be tracked is [b]bl[/b].
     //  The particle reference data are taken from [b]data[/b].
     //  The particle bunch is taken from [b]bunch[/b].
-    //  If [b]revBeam[/b] is true, the beam runs from s = C to s = 0.
-    //  If [b]revTrack[/b] is true, we track against the beam.
+    //  If [b]backBeam[/b] is true, the beam runs from s = C to s = 0.
+    //  If [b]backTrack[/b] is true, we track against the beam.
     Tracker(const Beamline &, PartBunchBase<double, 3> *bunch,
             const PartData &, bool backBeam, bool backTrack);
 

src/Classic/Fields/Interpolation/PPSolveFactory.h

@@ -122,7 +122,7 @@ class PPSolveFactory {
     void getDerivPoints();
     void getDerivs(Mesh::Iterator it);
 
-    // nothing calls this method but I don't quite field brave enought to remove
+    // nothing calls this method but I don't quite feel brave enough to remove
     // it...
     std::vector<double> outOfBoundsPosition(Mesh::Iterator outOfBoundsIt);
     static void nearbyPointsRecursive(

src/Elements/OpalFlexibleCollimator.cpp

@@ -25,7 +25,7 @@
 
 OpalFlexibleCollimator::OpalFlexibleCollimator():
     OpalElement(SIZE, "FLEXIBLECOLLIMATOR",
-                "The \"FLEXIBLECOLLIMATOR\" element defines a slit."),
+                "The \"FLEXIBLECOLLIMATOR\" element defines a flexible collimator."),
     partMatInt_m(NULL) {
     itsAttr[FNAME] = Attributes::makeString
                      ("FNAME", "File name containing description of holes");

src/Elements/OpalPepperPot.cpp

 //
 // Class OpalPepperPot
 //   The PEPPERPOT element.
-//   The class of OPAL elliptic collimators.
+//   The class of OPAL pepperpot collimators.
 //
 // Copyright (c) 200x - 2020, Paul Scherrer Institut, Villigen PSI, Switzerland
 // All rights reserved
@@ -24,7 +24,7 @@
 
 OpalPepperPot::OpalPepperPot():
     OpalElement(SIZE, "PEPPERPOT",
-                "The \"PEPPERPOT\" element defines an elliptic collimator."),
+                "The \"PEPPERPOT\" element defines an pepperpot collimator."),
     parmatint_m(NULL) {
     itsAttr[XSIZE] = Attributes::makeReal
                      ("XSIZE", "Size in x of the pepperpot in m");

src/Expressions/SDeferred.h

@@ -125,12 +125,12 @@ namespace Expressions {
                                    this->getImage() + "\": " + ex.what());
             } catch(std::exception &ex) {
                 in_evaluation = false;
-                throw LogicalError("ADeferred::evaluate()",
+                throw LogicalError("SDeferred::evaluate()",
                                    "Standard C++ exception while evaluating \"" +
                                    this->getImage() + "\": " + ex.what());
             } catch(...) {
                 in_evaluation = false;
-                throw LogicalError("ADeferred::evaluate()",
+                throw LogicalError("SDeferred::evaluate()",
                                    "Unknown exception while evaluating \"" +
                                    this->getImage() + "\": ");
             }

src/Expressions/SRefAttr.h

@@ -174,7 +174,7 @@ namespace Expressions {
 
     template <class T>
     double SRefAttr<T>::getReal() {
-        throw ParseError("SValue<T>::getReal()",
+        throw ParseError("SRefAttr<T>::getReal()",
                          "Attribute is not of real type.");
     }
 

src/Lines/SequenceMember.h

@@ -71,7 +71,7 @@ public:
     MemberType itsType;
 
     // ada 4.5 2000 to speed up matching, add a pointer to
-    // opal elements in order to avoid serching the opal elements
+    // opal elements in order to avoid searching the opal elements
     Pointer<Element> OpalElement;
 
 

src/Solvers/BoxCornerDomain.h

@@ -34,8 +34,7 @@
 
 /*
 
-    A and B are the half apperture of the box
-
+    A and B are the half aperture of the box
 
                                      / (A,B)
                                     /
@@ -85,7 +84,7 @@ public:
                     std::string interpl);
     ~BoxCornerDomain();
 
-    /// as a function of z, determine the hight (B) of the geometry
+    /// as a function of z, determine the height (B) of the geometry
     inline double getB(double z) const {
       if((z < getZRangeMin()) || (z > getZRangeMax()))
             return getYRangeMax();

src/Structure/FieldSolver.cpp

@@ -74,9 +74,9 @@ namespace {
         MX,         // mesh sixe in x
         MY,         // mesh sixe in y
         MT,         // mesh sixe in z
-        PARFFTX,    // parallelized grind in x
-        PARFFTY,    // parallelized grind in y
-        PARFFTT,    // parallelized grind in z
+        PARFFTX,    // parallelized grid in x
+        PARFFTY,    // parallelized grid in y
+        PARFFTT,    // parallelized grid in z
         BCFFTX,     // boundary condition in x [FFT + AMR_MG only]
         BCFFTY,     // boundary condition in y [FFT + AMR_MG only]
         BCFFTZ,     // boundary condition in z [FFT + AMR_MG only]
@@ -248,15 +248,15 @@ FieldSolver::FieldSolver():
                                                  16);
 
     itsAttr[AMR_BFX] = Attributes::makeReal("AMR_BFX",
-                                            "Blocking factor in x for AMR (AMR_MAXGRIDX needs to be a multiple",
+                                            "Blocking factor in x for AMR (AMR_MAXGRIDX needs to be a multiple)",
                                             8);
 
     itsAttr[AMR_BFY] = Attributes::makeReal("AMR_BFY",
-                                            "Blocking factor in y for AMR (AMR_MAXGRIDY needs to be a multiple",
+                                            "Blocking factor in y for AMR (AMR_MAXGRIDY needs to be a multiple)",
                                             8);
 
     itsAttr[AMR_BFZ] = Attributes::makeReal("AMR_BFZ",
-                                            "Blocking factor in y for AMR (AMR_MAXGRIDZ needs to be a multiple",
+                                            "Blocking factor in y for AMR (AMR_MAXGRIDZ needs to be a multiple)",
                                             8);
 
     itsAttr[AMR_TAGGING] = Attributes::makeUpperCaseString("AMR_TAGGING",
@@ -278,7 +278,7 @@ FieldSolver::FieldSolver():
     itsAttr[AMR_SCALING] = Attributes::makeReal("AMR_SCALING",
                                                 "Scaling value for maximum value tagging "
                                                 "(only POTENTIAL / CHARGE_DENSITY / "
-                                                "MOMENTA", 0.75);
+                                                "MOMENTA)", 0.75);
 
     itsAttr[AMR_DOMAIN_RATIO] = Attributes::makeRealArray("AMR_DOMAIN_RATIO",
                                                          "Box ratio of AMR computation domain. Default: [-1, 1]^3");

src/Track/TrackEnd.cpp

@@ -7,7 +7,7 @@
 // ------------------------------------------------------------------------
 //
 // Class: TrackEnd
-//   The class fore the OPAL ENDTRACK command.
+//   The class for the OPAL ENDTRACK command.
 //
 // ------------------------------------------------------------------------
 //

tools/README

@@ -4,3 +4,6 @@ Unpack the sources, change to the directory epics/extensions/src/ and then upack
 in this directory. Finally apply the patch SDDS.patch with the command
 $ patch -p1 < /path/to/patch/SDDS.patch
 Now you can use cmake to compile and install the SDDS library.
+
+Comment from Christof:
+These two programs (not scripts) export particle positions and momenta from HDF5 files to SDDS and from SDDS to ASCII (which then can be used to as FROMFILE distribution)
\ No newline at end of file