From 83fae973125bff99e50f74280405edf7be607db7 Mon Sep 17 00:00:00 2001
From: adrien matta <matta@lpccaen.in2p3.fr>
Date: Fri, 10 Mar 2017 16:58:52 +0100
Subject: [PATCH] * Solving several compialtion error within NPInputParser
---
NPLib/Core/NPInputParser.cxx | 15 ++++++---------
NPLib/Core/NPInputParser.h | 3 ++-
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/NPLib/Core/NPInputParser.cxx b/NPLib/Core/NPInputParser.cxx
index a974c1693..95ddb6f73 100644
--- a/NPLib/Core/NPInputParser.cxx
+++ b/NPLib/Core/NPInputParser.cxx
@@ -335,26 +335,23 @@ std::vector<std::string> InputParser::GetAllBlocksToken(){
void InputParser::TreatAliases(){
// Call the alias block
- std::vector<NPL::InputBlock*> blocks = GetAllBlockWithToken("Alias");
- // List of token:
+ std::vector<NPL::InputBlock*> blocks = GetAllBlocksWithToken("Alias");
+ // List of token:
+
// - Action -> take value Split(create new block for each value) or Inplace
// - Type -> Specify the type of value Vector/Int/Double/String
// - Value -> The list of value to be used
- std::vector<std::string> token = {"Action","Type","Value"}
+ std::vector<std::string> token = {"Action","Type","Value"};
for(unsigned int i = 0 ; i < blocks.size() ; i++){
string alias = blocks[i]->GetMainValue();
- std::string action = blocks->GetString("Action");
- std::vector<std::string> value = blocks->GetVectorString("Value");
+ std::string action = blocks[i]->GetString("Action");
+ std::vector<std::string> value = blocks[i]->GetVectorString("Value");
for(unsigned int v = 0 ; v < value.size() ; v++){
}
}
-}
-////////////////////////////////////////////////////////////////////////////////
-void InputParser::TreatOneAliases(){
-
}
////////////////////////////////////////////////////////////////////////////////
void InputParser::ReadFile(std::string filename,bool ExitOnError){
diff --git a/NPLib/Core/NPInputParser.h b/NPLib/Core/NPInputParser.h
index 7effe2451..9d2e16db8 100644
--- a/NPLib/Core/NPInputParser.h
+++ b/NPLib/Core/NPInputParser.h
@@ -26,6 +26,7 @@
// STL
#include<string>
#include<vector>
+#include<map>
// ROOT
#include"TVector3.h"
@@ -100,7 +101,7 @@ namespace NPL{
public:
void ReadFile(std::string filename,bool ExitOnError=true);
void TreatAliases();
- void TreatOneAlias();
+ void TreatOneAlias(){};
void Dump();
void Print() {Dump();}
void Clear();
--
GitLab