Commit c888bb8c authored by frey_m's avatar frey_m
Browse files

Optimiser: InfNormRadialPeak --> MaxNormRadialPeak (see issue #233)

parent 6e884066
......@@ -32,7 +32,7 @@
#include "Expression/SDDSVariable.h"
#include "Expression/RadialPeak.h"
#include "Expression/SumErrSqRadialPeak.h"
#include "Expression/InfNormRadialPeak.h"
#include "Expression/MaxNormRadialPeak.h"
#include "Expression/ProbeVariable.h"
//////////////////////////////////////////////////////////////////////////////
......@@ -79,9 +79,9 @@ int main(int argc, char** argv) {
ff = RadialPeak();
funcs.insert(std::pair<std::string, client::function::type>
("radialPeak", ff));
ff = InfNormRadialPeak();
ff = MaxNormRadialPeak();
funcs.insert(std::pair<std::string, client::function::type>
("infNormRadialPeak", ff));
("maxNormRadialPeak", ff));
ff = SumErrSqRadialPeak();
funcs.insert(std::pair<std::string, client::function::type>
("sumErrSqRadialPeak", ff));
......
......@@ -2,7 +2,7 @@
SET (_EXPR_SRCS
SumErrSq.cpp
FromFile.cpp
InfNormRadialPeak.cpp
MaxNormRadialPeak.cpp
RadialPeak.cpp
SumErrSqRadialPeak.cpp
Parser/expression.cpp
......
#include "Expression/InfNormRadialPeak.h"
const std::string name = "InfNormRadialPeak";
#include "Expression/MaxNormRadialPeak.h"
const std::string name = "MaxNormRadialPeak";
#ifndef __INFNORMRADIALPEAK_H__
#define __INFNORMRADIALPEAK_H__
#ifndef __MAX_NORM_RADIALPEAK_H__
#define __MAX_NORM_RADIALPEAK_H__
#include <string>
......@@ -24,7 +24,7 @@
* \f]
*
*/
struct InfNormRadialPeak {
struct MaxNormRadialPeak {
static const std::string name;
......@@ -44,7 +44,7 @@ struct InfNormRadialPeak {
meas_peaks->parseFile();
if ( end_ < begin_ || end_ < 0 || begin_ < 0 )
throw OptPilotException("InfNormRadialPeak::operator()",
throw OptPilotException("MaxNormRadialPeak::operator()",
"Error check turn number range");
} catch (OptPilotException &ex) {
......
......@@ -32,7 +32,7 @@
#include "Expression/SumErrSq.h"
#include "Expression/SDDSVariable.h"
#include "Expression/RadialPeak.h"
#include "Expression/InfNormRadialPeak.h"
#include "Expression/MaxNormRadialPeak.h"
#include "Expression/SumErrSqRadialPeak.h"
#include "Expression/ProbeVariable.h"
......@@ -187,9 +187,9 @@ void OptimizeCmd::execute() {
funcs.insert(std::pair<std::string, client::function::type>
("radialPeak", ff));
ff = InfNormRadialPeak();
ff = MaxNormRadialPeak();
funcs.insert(std::pair<std::string, client::function::type>
("infNormRadialPeak", ff));
("maxNormRadialPeak", ff));
ff = SumErrSqRadialPeak();
funcs.insert(std::pair<std::string, client::function::type>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment