fix for Linux version

backend/aml/v0/cmt/requirements

@@ -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

 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

@@ -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

 
 #include <iostream>
+#include <iterator>
 #include "BETAParser.h"
 
 using namespace std;

backend/pspa/v0/src/Core/softwareAstra.cc

 
 #include <iostream>
+#include <iomanip>      // std::setw
 
 #include "softwareAstra.h"
 #include "generatorParticle.h"

backend/pspa/v0/src/Core/softwareBeta.cc

 
+#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

 
 #include <iostream>
+#include <iomanip>      // std::setw
 
 #include "softwareElegant.h"
 #include "PhysicalConstants.h"

backend/pspa/v0/src/Core/softwareMadx.cc

 
+#include <iostream>
+#include <iomanip>      // std::setw
 #include "softwareMadx.h"
 #include "dataManager.h"