Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
OPAL
src
Commits
846b7728
Commit
846b7728
authored
Apr 06, 2020
by
frey_m
Browse files
file headers to expressions
parent
f6303646
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
210 additions
and
28 deletions
+210
-28
optimizer/Expression/MaxNormRadialPeak.cpp
optimizer/Expression/MaxNormRadialPeak.cpp
+29
-0
optimizer/Expression/MaxNormRadialPeak.h
optimizer/Expression/MaxNormRadialPeak.h
+29
-10
optimizer/Expression/NumberOfPeaks.cpp
optimizer/Expression/NumberOfPeaks.cpp
+24
-0
optimizer/Expression/NumberOfPeaks.h
optimizer/Expression/NumberOfPeaks.h
+24
-4
optimizer/Expression/SumErrSqRadialPeak.cpp
optimizer/Expression/SumErrSqRadialPeak.cpp
+29
-0
optimizer/Expression/SumErrSqRadialPeak.h
optimizer/Expression/SumErrSqRadialPeak.h
+29
-10
optimizer/Util/PeakReader.cpp
optimizer/Util/PeakReader.cpp
+23
-0
optimizer/Util/PeakReader.h
optimizer/Util/PeakReader.h
+23
-4
No files found.
optimizer/Expression/MaxNormRadialPeak.cpp
View file @
846b7728
//
// Struct MaxNormRadialPeak
// A simple expression computing the maximum norm of all peak errors (given as
// first and second argument) for a range of peaks (third argument and fourth argument)
// according to
//
// \f[
// result = ||measurement_i - value_i||_\infty
// \f]
//
// Copyright (c) 2018, Matthias Frey, Paul Scherrer Institut, Villigen PSI, Switzerland
// All rights reserved
//
// Implemented as part of the PhD thesis
// "Precise Simulations of Multibunches in High Intensity Cyclotrons"
// and the paper
// "Matching of turn pattern measurements for cyclotrons using multiobjective optimization"
// (https://doi.org/10.1103/PhysRevAccelBeams.22.064602)
//
// This file is part of OPAL.
//
// OPAL is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// You should have received a copy of the GNU General Public License
// along with OPAL. If not, see <https://www.gnu.org/licenses/>.
//
#include "Expression/MaxNormRadialPeak.h"
const
std
::
string
name
=
"MaxNormRadialPeak"
;
optimizer/Expression/MaxNormRadialPeak.h
View file @
846b7728
//
// Struct MaxNormRadialPeak
// A simple expression computing the maximum norm of all peak errors (given as
// first and second argument) for a range of peaks (third argument and fourth argument)
// according to
//
// \f[
// result = ||measurement_i - value_i||_\infty
// \f]
//
// Copyright (c) 2018, Matthias Frey, Paul Scherrer Institut, Villigen PSI, Switzerland
// All rights reserved
//
// Implemented as part of the PhD thesis
// "Precise Simulations of Multibunches in High Intensity Cyclotrons"
// and the paper
// "Matching of turn pattern measurements for cyclotrons using multiobjective optimization"
// (https://doi.org/10.1103/PhysRevAccelBeams.22.064602)
//
// This file is part of OPAL.
//
// OPAL is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// You should have received a copy of the GNU General Public License
// along with OPAL. If not, see <https://www.gnu.org/licenses/>.
//
#ifndef __MAX_NORM_RADIALPEAK_H__
#define __MAX_NORM_RADIALPEAK_H__
...
...
@@ -14,16 +43,6 @@
#include "Util/PeakReader.h"
#include "Expression/Parser/function.hpp"
/**
* A simple expression computing the maximum norm of all peak errors (given as
* first and second argument) for a range of peaks (third argument and fourth argument)
* according to
*
* \f[
* result = ||measurement_i - value_i||_\infty
* \f]
*
*/
struct
MaxNormRadialPeak
{
static
const
std
::
string
name
;
...
...
optimizer/Expression/NumberOfPeaks.cpp
View file @
846b7728
//
// Struct NumberOfPeaks
// A simple expression to check the number of turns in a circular machine. It checks
// probe files (*.peaks) and counts the number of turns.
//
// Copyright (c) 2018, Matthias Frey, Paul Scherrer Institut, Villigen PSI, Switzerland
// All rights reserved
//
// Implemented as part of the PhD thesis
// "Precise Simulations of Multibunches in High Intensity Cyclotrons"
// and the paper
// "Matching of turn pattern measurements for cyclotrons using multiobjective optimization"
// (https://doi.org/10.1103/PhysRevAccelBeams.22.064602)
//
// This file is part of OPAL.
//
// OPAL is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// You should have received a copy of the GNU General Public License
// along with OPAL. If not, see <https://www.gnu.org/licenses/>.
//
#include "Expression/NumberOfPeaks.h"
const
std
::
string
name
=
"NumberOfPeaks"
;
optimizer/Expression/NumberOfPeaks.h
View file @
846b7728
//
// Struct NumberOfPeaks
// A simple expression to check the number of turns in a circular machine. It checks
// probe files (*.peaks) and counts the number of turns.
//
// Copyright (c) 2018, Matthias Frey, Paul Scherrer Institut, Villigen PSI, Switzerland
// All rights reserved
//
// Implemented as part of the PhD thesis
// "Precise Simulations of Multibunches in High Intensity Cyclotrons"
// and the paper
// "Matching of turn pattern measurements for cyclotrons using multiobjective optimization"
// (https://doi.org/10.1103/PhysRevAccelBeams.22.064602)
//
// This file is part of OPAL.
//
// OPAL is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// You should have received a copy of the GNU General Public License
// along with OPAL. If not, see <https://www.gnu.org/licenses/>.
//
#ifndef __NUMBER_OF_PEAKS_H__
#define __NUMBER_OF_PEAKS_H__
...
...
@@ -14,10 +38,6 @@
#include "Util/PeakReader.h"
#include "Expression/Parser/function.hpp"
/**
* A simple expression to check the number of turns in a circular machine. It checks
* probe files (*.peaks) and counts the number of turns.
*/
struct
NumberOfPeaks
{
static
const
std
::
string
name
;
...
...
optimizer/Expression/SumErrSqRadialPeak.cpp
View file @
846b7728
//
// Struct SumErrSqRadialPeak
// A simple expression computing the sum of all peak errors (given as
// first and second argument) for a range of peaks (third argument and fourth argument)
// according to
//
// \f[
// result = \frac{1}{n} * \sqrt{\sum_{i=start}^end (measurement_i - value_i)^2}
// \f]
//
// Copyright (c) 2017 - 2018, Matthias Frey, Paul Scherrer Institut, Villigen PSI, Switzerland
// All rights reserved
//
// Implemented as part of the PhD thesis
// "Precise Simulations of Multibunches in High Intensity Cyclotrons"
// and the paper
// "Matching of turn pattern measurements for cyclotrons using multiobjective optimization"
// (https://doi.org/10.1103/PhysRevAccelBeams.22.064602)
//
// This file is part of OPAL.
//
// OPAL is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// You should have received a copy of the GNU General Public License
// along with OPAL. If not, see <https://www.gnu.org/licenses/>.
//
#include "Expression/SumErrSqRadialPeak.h"
const
std
::
string
name
=
"SumErrSqRadialPeak"
;
optimizer/Expression/SumErrSqRadialPeak.h
View file @
846b7728
//
// Struct SumErrSqRadialPeak
// A simple expression computing the sum of all peak errors (given as
// first and second argument) for a range of peaks (third argument and fourth argument)
// according to
//
// \f[
// result = \frac{1}{n} * \sqrt{\sum_{i=start}^end (measurement_i - value_i)^2}
// \f]
//
// Copyright (c) 2017 - 2018, Matthias Frey, Paul Scherrer Institut, Villigen PSI, Switzerland
// All rights reserved
//
// Implemented as part of the PhD thesis
// "Precise Simulations of Multibunches in High Intensity Cyclotrons"
// and the paper
// "Matching of turn pattern measurements for cyclotrons using multiobjective optimization"
// (https://doi.org/10.1103/PhysRevAccelBeams.22.064602)
//
// This file is part of OPAL.
//
// OPAL is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// You should have received a copy of the GNU General Public License
// along with OPAL. If not, see <https://www.gnu.org/licenses/>.
//
#ifndef __SUMERRSQRADIALPEAK_H__
#define __SUMERRSQRADIALPEAK_H__
...
...
@@ -12,16 +41,6 @@
#include "Util/PeakReader.h"
#include "Expression/Parser/function.hpp"
/**
* A simple expression computing the sum of all peak errors (given as
* first and second argument) for a range of peaks (third argument and fourth argument)
* according to
*
* \f[
* result = \frac{1}{n} * \sqrt{\sum_{i=start}^end (measurement_i - value_i)^2}
* \f]
*
*/
struct
SumErrSqRadialPeak
{
static
const
std
::
string
name
;
...
...
optimizer/Util/PeakReader.cpp
View file @
846b7728
//
// Class PeakReader
// Implements a parser and value extractor for peak files (*.peaks)
//
// Copyright (c) 2017 - 2018, Matthias Frey, Paul Scherrer Institut, Villigen PSI, Switzerland
// All rights reserved
//
// Implemented as part of the PhD thesis
// "Precise Simulations of Multibunches in High Intensity Cyclotrons"
// and the paper
// "Matching of turn pattern measurements for cyclotrons using multiobjective optimization"
// (https://doi.org/10.1103/PhysRevAccelBeams.22.064602)
//
// This file is part of OPAL.
//
// OPAL is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// You should have received a copy of the GNU General Public License
// along with OPAL. If not, see <https://www.gnu.org/licenses/>.
//
#include <fstream>
#include <iterator>
...
...
optimizer/Util/PeakReader.h
View file @
846b7728
//
// Class PeakReader
// Implements a parser and value extractor for peak files (*.peaks)
//
// Copyright (c) 2017 - 2018, Matthias Frey, Paul Scherrer Institut, Villigen PSI, Switzerland
// All rights reserved
//
// Implemented as part of the PhD thesis
// "Precise Simulations of Multibunches in High Intensity Cyclotrons"
// and the paper
// "Matching of turn pattern measurements for cyclotrons using multiobjective optimization"
// (https://doi.org/10.1103/PhysRevAccelBeams.22.064602)
//
// This file is part of OPAL.
//
// OPAL is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// You should have received a copy of the GNU General Public License
// along with OPAL. If not, see <https://www.gnu.org/licenses/>.
//
#ifndef __PEAKREADER_H__
#define __PEAKREADER_H__
...
...
@@ -6,10 +29,6 @@
#include "Util/OptPilotException.h"
/**
* \class PeakReader
* \brief Implements a parser and value extractor for peak files (*.peaks)
*/
class
PeakReader
{
public:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment