Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
TOUZE Francois
PSPA
Commits
04934a23
Commit
04934a23
authored
Dec 06, 2019
by
TOUZE Francois
Browse files
fix for Linux version
parent
a93f3eb3
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
20 additions
and
8 deletions
+20
-8
backend/aml/v0/cmt/requirements
backend/aml/v0/cmt/requirements
+2
-2
backend/json/v0/cmt/requirements
backend/json/v0/cmt/requirements
+7
-2
backend/pspa/v0/cmt/requirements
backend/pspa/v0/cmt/requirements
+4
-2
backend/pspa/v0/src/Core/BETAParser.cc
backend/pspa/v0/src/Core/BETAParser.cc
+1
-0
backend/pspa/v0/src/Core/softwareAstra.cc
backend/pspa/v0/src/Core/softwareAstra.cc
+1
-0
backend/pspa/v0/src/Core/softwareBeta.cc
backend/pspa/v0/src/Core/softwareBeta.cc
+2
-2
backend/pspa/v0/src/Core/softwareElegant.cc
backend/pspa/v0/src/Core/softwareElegant.cc
+1
-0
backend/pspa/v0/src/Core/softwareMadx.cc
backend/pspa/v0/src/Core/softwareMadx.cc
+2
-0
No files found.
backend/aml/v0/cmt/requirements
View file @
04934a23
...
...
@@ -2,11 +2,11 @@ package aml
macro
aml_home
""
\
Darwin
"/Users/touze/Public/aml-uap.hg"
\
Linux
"/
usr/local/
accelerator-ml-code"
Linux
"/accelerator-ml-code"
macro
aml_cppflags
""
\
Darwin
" -I $(aml_home)"
\
Linux
" -I $(aml_home) -I/
usr/local/
xerces-c-3.
1.3
/src/xercesc"
Linux
" -I $(aml_home) -I/xerces-c-3.
2.2
/src/xercesc"
macro
aml_linkopts
""
\
Darwin
" -L${aml_home}/lib/ -lantlr -luap -L/usr/local/lib -lxerces-c"
\
...
...
backend/json/v0/cmt/requirements
View file @
04934a23
package
json
macro
json_home
"/usr/local/Cellar/nlohmann_json/3.1.2"
macro
json_cppflags
" -I/usr/local/include/nlohmann"
macro
json_home
""
\
Linux
"/json"
\
Darwin
"/usr/local/Cellar/nlohmann_json/3.1.2"
macro
json_cppflags
""
\
Linux
" -I/json/include"
\
Darwin
" -I/usr/local/include/nlohmann"
backend/pspa/v0/cmt/requirements
View file @
04934a23
...
...
@@ -4,10 +4,12 @@ use aml v0
use
json
v0
macro
cpp
""
\
Darwin
"g++ -std=c++14"
Darwin
"g++ -std=c++14"
\
Linux
"g++ -std=c++11"
macro
cppflags
""
\
Darwin
" -pipe -Wno-long-long -fPIC "
Darwin
" -pipe -Wno-long-long -fPIC "
\
Linux
" -pipe -Wno-long-long -fPIC "
macro
pspa_cppflags
" -w -I$(PSPAROOT)/src/KindOfElements -I$(PSPAROOT)/src/Core"
macro
pspa_linkopts
" -L$(PSPAROOT)/${CMTCONFIG} -lpspa"
...
...
backend/pspa/v0/src/Core/BETAParser.cc
View file @
04934a23
#include <iostream>
#include <iterator>
#include "BETAParser.h"
using
namespace
std
;
...
...
backend/pspa/v0/src/Core/softwareAstra.cc
View file @
04934a23
#include <iostream>
#include <iomanip> // std::setw
#include "softwareAstra.h"
#include "generatorParticle.h"
...
...
backend/pspa/v0/src/Core/softwareBeta.cc
View file @
04934a23
#include <iostream>
#include <iomanip> // std::setw
#include "softwareBeta.h"
#include "dataManager.h"
...
...
@@ -7,8 +9,6 @@
#include "mixedTools.h"
#include "INIReader.h"
#include <iomanip> // std::setw
softwareBeta
::
softwareBeta
()
:
abstractSoftware
()
{
INIReader
reader
(
"../../pspa_config.ini"
);
...
...
backend/pspa/v0/src/Core/softwareElegant.cc
View file @
04934a23
#include <iostream>
#include <iomanip> // std::setw
#include "softwareElegant.h"
#include "PhysicalConstants.h"
...
...
backend/pspa/v0/src/Core/softwareMadx.cc
View file @
04934a23
#include <iostream>
#include <iomanip> // std::setw
#include "softwareMadx.h"
#include "dataManager.h"
...
...
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