diff --git a/NPLib/Core/NPInputParser.cxx b/NPLib/Core/NPInputParser.cxx
index 9680ce502e2a091692278f26df6e8e892d3148df..87f6f348ec3f1f17c2c879dd1338876969d3a3fa 100644
--- a/NPLib/Core/NPInputParser.cxx
+++ b/NPLib/Core/NPInputParser.cxx
@@ -1,346 +1,348 @@
-#include"NPInputParser.h"
-#include"NPSystemOfUnits.h"
-#include"NPOptionManager.h"
-#include"NPCore.h"
-#include<sstream>
-#include<iostream>
-#include<fstream>
-#include<algorithm>
+#include "NPInputParser.h"
+#include "NPCore.h"
+#include "NPOptionManager.h"
+#include "NPSystemOfUnits.h"
+#include <algorithm>
+#include <fstream>
+#include <iostream>
+#include <sstream>
////////////////////////////////////////////////////////////////////////////////
-NPL::InputBlock* NPL::InputBlock::Copy(){
+NPL::InputBlock* NPL::InputBlock::Copy() {
NPL::InputBlock* res = new NPL::InputBlock();
res->m_Level = this->m_Level;
res->m_MainToken = this->m_MainToken;
res->m_MainValue = this->m_MainValue;
res->m_Token = this->m_Token;
- res->m_Value = this->m_Value;
+ res->m_Value = this->m_Value;
return res;
}
-
////////////////////////////////////////////////////////////////////////////////
-std::string NPL::StripSpaces(std::string line){
+std::string NPL::StripSpaces(std::string line) {
// Remove preceding spaces
- while(*line.begin()==' ')
- line = line.substr(1,line.length());
+ while (*line.begin() == ' ')
+ line = line.substr(1, line.length());
// Remove trailing spaces
- if(line.length()>0)
- while(*line.rbegin()==' ')
- line = line.substr(0,line.length()-1);
+ if (line.length() > 0)
+ while (*line.rbegin() == ' ')
+ line = line.substr(0, line.length() - 1);
// Remove preceding tabs
- while(*line.begin()=='\t')
- line = line.substr(1,line.length());
+ while (*line.begin() == '\t')
+ line = line.substr(1, line.length());
// Remove trailing tabs
- if(line.length()>0)
- while(*line.rbegin()=='\t')
- line = line.substr(0,line.length()-1);
+ if (line.length() > 0)
+ while (*line.rbegin() == '\t')
+ line = line.substr(0, line.length() - 1);
return line;
-
}
////////////////////////////////////////////////////////////////////////////////
-unsigned int NPL::GetLevel(std::string line){
- unsigned int level = 0 ;
- if(line.length()==0)
+unsigned int NPL::GetLevel(std::string line) {
+ unsigned int level = 0;
+ if (line.length() == 0)
return 1000;
- for(unsigned int i = 0 ; i < line.length() ; i++){
- if(line.compare(i,1," ")==0)
+ for (unsigned int i = 0; i < line.length(); i++) {
+ if (line.compare(i, 1, " ") == 0)
level++;
- else
+ else
break;
}
- return level;
+ return level;
}
////////////////////////////////////////////////////////////////////////////////
-std::string NPL::ToLower(std::string line){
+std::string NPL::ToLower(std::string line) {
std::transform(line.begin(), line.end(), line.begin(), ::tolower);
return line;
}
////////////////////////////////////////////////////////////////////////////////
-NPL::InputBlock::InputBlock(std::string line){
- m_Level = GetLevel(line);
- m_MainToken = StripSpaces(ExtractToken(line," "));
- m_MainValue = StripSpaces(ExtractValue(line," "));
+NPL::InputBlock::InputBlock(std::string line) {
+ m_Level = GetLevel(line);
+ m_MainToken = StripSpaces(ExtractToken(line, " "));
+ m_MainValue = StripSpaces(ExtractValue(line, " "));
}
////////////////////////////////////////////////////////////////////////////////
-std::string NPL::InputBlock::ExtractToken(std::string line,std::string separator){
+std::string NPL::InputBlock::ExtractToken(std::string line, std::string separator) {
// Find the separator
- if(separator=="")
+ if (separator == "")
separator = NPL::token_separator;
std::size_t pos = line.find(separator.c_str());
- return line.substr (0,pos);
+ return line.substr(0, pos);
}
////////////////////////////////////////////////////////////////////////////////
-std::string NPL::InputBlock::ExtractValue(std::string line,std::string separator){
+std::string NPL::InputBlock::ExtractValue(std::string line, std::string separator) {
// Find the separator
- if(separator=="")
+ if (separator == "")
separator = NPL::token_separator;
std::size_t pos = line.find(separator.c_str());
- if(pos!=std::string::npos)
- return line.substr (pos+1);
+ if (pos != std::string::npos)
+ return line.substr(pos + 1);
else
return "";
}
////////////////////////////////////////////////////////////////////////////////
-void NPL::InputBlock::AddLine(std::string line){
+void NPL::InputBlock::AddLine(std::string line) {
m_Token.push_back(ToLower(StripSpaces(ExtractToken(line))));
m_Value.push_back(StripSpaces(ExtractValue(line)));
- m_Lines.push_back(StripSpaces(line));
+ m_Lines.push_back(StripSpaces(line));
}
////////////////////////////////////////////////////////////////////////////////
-void NPL::InputBlock::Dump(){
+void NPL::InputBlock::Dump() {
std::cout << "//////////// Block ////////////" << std::endl;
- std::cout << " * Main Token: " << m_MainToken << std::endl ;
- std::cout << " * Main Value: " << m_MainValue << std::endl;
+ std::cout << " * Main Token: " << m_MainToken << std::endl;
+ std::cout << " * Main Value: " << m_MainValue << std::endl;
std::cout << " * Number of Line: " << GetSize() << std::endl;
- for(unsigned int i = 0 ; i < GetSize() ; i++)
- std::cout << " - " << i+1 << " " << m_Token[i] << ": " << m_Value[i] << std::endl;
+ for (unsigned int i = 0; i < GetSize(); i++)
+ std::cout << " - " << i + 1 << " " << m_Token[i] << ": " << m_Value[i] << std::endl;
}
////////////////////////////////////////////////////////////////////////////////
-bool NPL::InputBlock::HasTokenList(std::vector<std::string> Token){
- if(m_Token.size()==0)
+bool NPL::InputBlock::HasTokenList(std::vector<std::string> Token) {
+ if (m_Token.size() == 0)
return false;
bool res = true;
- for(unsigned int i = 0 ; i < Token.size() ; i++)
+ for (unsigned int i = 0; i < Token.size(); i++)
res = res && HasToken(Token[i]);
return res;
}
////////////////////////////////////////////////////////////////////////////////
-bool NPL::InputBlock::HasToken(std::string Token){
- for(unsigned int i = 0 ; i < m_Token.size() ; i++){
- if(m_Token[i] == ToLower(Token)){
+std::vector<std::string> NPL::InputBlock::GetMissingToken(std::vector<std::string> Token) {
+ std::vector<std::string> missing;
+ for (unsigned int i = 0; i < Token.size(); i++) {
+ if (!HasToken(Token[i]))
+ missing.push_back(Token[i]);
+ }
+ return missing;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool NPL::InputBlock::HasToken(std::string Token) {
+ for (unsigned int i = 0; i < m_Token.size(); i++) {
+ if (m_Token[i] == ToLower(Token)) {
return true;
}
}
return false;
}
////////////////////////////////////////////////////////////////////////////////
-std::string NPL::InputBlock::GetValue(std::string Token){
- for(unsigned int i = 0 ; i < m_Token.size() ; i++){
- if(m_Token[i]==ToLower(Token))
+std::string NPL::InputBlock::GetValue(std::string Token) {
+ for (unsigned int i = 0; i < m_Token.size(); i++) {
+ if (m_Token[i] == ToLower(Token))
return m_Value[i];
}
return "";
-
}
////////////////////////////////////////////////////////////////////////////////
-double NPL::InputBlock::GetDouble(std::string Token,std::string default_unit){
- int verbose = 1; //NPOptionManager::getInstance()->GetVerboseLevel();
+double NPL::InputBlock::GetDouble(std::string Token, std::string default_unit) {
+ int verbose = 1; // NPOptionManager::getInstance()->GetVerboseLevel();
std::stringstream iss(GetValue(Token));
double val;
std::string unit;
- iss >> val >> unit ;
- if(unit==""){
- if(default_unit!="void")
- std::cout <<"WARNING: Using default units for token " << Token << std::endl;
- val = ApplyUnit(val,default_unit);
+ iss >> val >> unit;
+ if (unit == "") {
+ if (default_unit != "void")
+ std::cout << "WARNING: Using default units for token " << Token << std::endl;
+ val = ApplyUnit(val, default_unit);
}
- else{
- val = ApplyUnit(val,unit);
+ else {
+ val = ApplyUnit(val, unit);
}
- if(verbose)
- printf(" %s (%s): %.4f\n",Token.c_str(),default_unit.c_str(), val/ApplyUnit(1,default_unit));
-// std::cout << " " << Token << " (" <<default_unit << "): " << val/ApplyUnit(1,default_unit) <<std::endl;
+ if (verbose)
+ printf(" %s (%s): %.4f\n", Token.c_str(), default_unit.c_str(), val / ApplyUnit(1, default_unit));
+ // std::cout << " " << Token << " (" <<default_unit << "): " << val/ApplyUnit(1,default_unit) <<std::endl;
- return val;
+ return val;
}
////////////////////////////////////////////////////////////////////////////////
-int NPL::InputBlock::GetInt(std::string Token){
- int verbose = 1;//NPOptionManager::getInstance()->GetVerboseLevel();
+int NPL::InputBlock::GetInt(std::string Token) {
+ int verbose = 1; // NPOptionManager::getInstance()->GetVerboseLevel();
std::stringstream iss(GetValue(Token));
int val;
- iss >> val ;
-
- if(verbose)
- printf(" %s: %d\n",Token.c_str(),val);
- // std::cout << " " << Token << ": " << val <<std::endl;
+ iss >> val;
+ if (verbose)
+ printf(" %s: %d\n", Token.c_str(), val);
+ // std::cout << " " << Token << ": " << val <<std::endl;
- return val;
+ return val;
}
////////////////////////////////////////////////////////////////////////////////
-std::string NPL::InputBlock::GetString(std::string Token){
- int verbose = 1;//NPOptionManager::getInstance()->GetVerboseLevel();
- if(verbose)
- printf(" %s: %s\n",Token.c_str(),GetValue(Token).c_str());
-// std::cout << " " << Token << ": " << GetValue(Token) << std::endl;
+std::string NPL::InputBlock::GetString(std::string Token) {
+ int verbose = 1; // NPOptionManager::getInstance()->GetVerboseLevel();
+ if (verbose)
+ printf(" %s: %s\n", Token.c_str(), GetValue(Token).c_str());
+ // std::cout << " " << Token << ": " << GetValue(Token) << std::endl;
return GetValue(Token);
}
////////////////////////////////////////////////////////////////////////////////
-TVector3 NPL::InputBlock::GetTVector3(std::string Token,std::string default_unit){
- int verbose = 1; //NPOptionManager::getInstance()->GetVerboseLevel();
+TVector3 NPL::InputBlock::GetTVector3(std::string Token, std::string default_unit) {
+ int verbose = 1; // NPOptionManager::getInstance()->GetVerboseLevel();
std::stringstream iss(GetValue(Token));
- double x,y,z;
+ double x, y, z;
std::string unit;
- iss >> x >> y >> z >> unit ;
- if(unit==""){
- if(default_unit!="void")
- std::cout <<"WARNING: Using default units for token " << Token << std::endl;
- x = ApplyUnit(x,default_unit);
- y = ApplyUnit(y,default_unit);
- z = ApplyUnit(z,default_unit);
- }
- else{
- x = ApplyUnit(x,unit);
- y = ApplyUnit(y,unit);
- z = ApplyUnit(z,unit);
- }
-
- if(verbose)
-
- printf(" %s (%s): (%.4f;%.4f;%.4f)\n",Token.c_str(),default_unit.c_str(), x/ApplyUnit(1,default_unit),y/ApplyUnit(1,default_unit),z/ApplyUnit(1,default_unit));
-// std::cout << " " << Token << " (" <<default_unit << "): ("
-// << x/ApplyUnit(1,default_unit) << " ; "
-// << y/ApplyUnit(1,default_unit) << " ; "
-// << z/ApplyUnit(1,default_unit) << ")" << std::endl;
-
-
- return TVector3(x,y,z);
+ iss >> x >> y >> z >> unit;
+ if (unit == "") {
+ if (default_unit != "void")
+ std::cout << "WARNING: Using default units for token " << Token << std::endl;
+ x = ApplyUnit(x, default_unit);
+ y = ApplyUnit(y, default_unit);
+ z = ApplyUnit(z, default_unit);
+ }
+ else {
+ x = ApplyUnit(x, unit);
+ y = ApplyUnit(y, unit);
+ z = ApplyUnit(z, unit);
+ }
+
+ if (verbose)
+
+ printf(" %s (%s): (%.4f;%.4f;%.4f)\n", Token.c_str(), default_unit.c_str(), x / ApplyUnit(1, default_unit),
+ y / ApplyUnit(1, default_unit), z / ApplyUnit(1, default_unit));
+ // std::cout << " " << Token << " (" <<default_unit << "): ("
+ // << x/ApplyUnit(1,default_unit) << " ; "
+ // << y/ApplyUnit(1,default_unit) << " ; "
+ // << z/ApplyUnit(1,default_unit) << ")" << std::endl;
+
+ return TVector3(x, y, z);
}
////////////////////////////////////////////////////////////////////////////////
-std::vector<std::string> NPL::InputBlock::GetVectorString(std::string Token){
- int verbose = 1 ; //NPOptionManager::getInstance()->GetVerboseLevel();
+std::vector<std::string> NPL::InputBlock::GetVectorString(std::string Token) {
+ int verbose = 1; // NPOptionManager::getInstance()->GetVerboseLevel();
std::stringstream iss(GetValue(Token));
std::vector<std::string> val;
std::string buffer;
- while(iss>>buffer)
+ while (iss >> buffer)
val.push_back(buffer);
+ if (verbose) {
+ printf(" %s: ", Token.c_str());
+ // std::cout << " " << Token << ": ";
+ for (unsigned int i = 0; i < val.size(); i++)
+ printf("%s ", val[i].c_str());
+ // std::cout << val[i] << " " ;
- if(verbose){
- printf(" %s: ",Token.c_str());
- //std::cout << " " << Token << ": ";
- for(unsigned int i = 0 ; i < val.size() ; i++)
- printf("%s ",val[i].c_str());
- //std::cout << val[i] << " " ;
-
printf("\n");
- //std::cout << std::endl;
-
+ // std::cout << std::endl;
}
- return val;
+ return val;
}
////////////////////////////////////////////////////////////////////////////////
-std::vector<double> NPL::InputBlock::GetVectorDouble(std::string Token,std::string default_unit){
- int verbose = 1 ; // NPOptionManager::getInstance()->GetVerboseLevel();
+std::vector<double> NPL::InputBlock::GetVectorDouble(std::string Token, std::string default_unit) {
+ int verbose = 1; // NPOptionManager::getInstance()->GetVerboseLevel();
std::stringstream iss(GetValue(Token));
std::vector<double> val;
double buffer;
- while(iss>>buffer)
+ while (iss >> buffer)
val.push_back(buffer);
- // Try to read the unit
+ // Try to read the unit
iss.clear();
std::string unit;
- iss>>unit;
+ iss >> unit;
- if(unit==""){
- if(default_unit!="void")
- std::cout <<"WARNING: Using default units for token " << Token << std::endl;
- for(unsigned int i = 0 ; i < val.size() ; i++)
- val[i]=ApplyUnit(val[i],default_unit);
+ if (unit == "") {
+ if (default_unit != "void")
+ std::cout << "WARNING: Using default units for token " << Token << std::endl;
+ for (unsigned int i = 0; i < val.size(); i++)
+ val[i] = ApplyUnit(val[i], default_unit);
}
- else{
- for(unsigned int i = 0 ; i < val.size() ; i++)
- val[i]=ApplyUnit(val[i],unit);
+ else {
+ for (unsigned int i = 0; i < val.size(); i++)
+ val[i] = ApplyUnit(val[i], unit);
}
- if(verbose){
- printf(" %s (%s): ",Token.c_str(),default_unit.c_str());
- //std::cout << " " << Token << " (" << default_unit << "): ";
- for(unsigned int i = 0 ; i < val.size() ; i++)
- printf("%f ",val[i]/ApplyUnit(1,default_unit) );
- //std::cout << val[i]/ApplyUnit(1,default_unit) << " " ;
+ if (verbose) {
+ printf(" %s (%s): ", Token.c_str(), default_unit.c_str());
+ // std::cout << " " << Token << " (" << default_unit << "): ";
+ for (unsigned int i = 0; i < val.size(); i++)
+ printf("%f ", val[i] / ApplyUnit(1, default_unit));
+ // std::cout << val[i]/ApplyUnit(1,default_unit) << " " ;
printf("\n");
- //std::cout << std::endl;
+ // std::cout << std::endl;
}
- return val;
+ return val;
}
////////////////////////////////////////////////////////////////////////////////
-std::vector<int> NPL::InputBlock::GetVectorInt(std::string Token){
- int verbose = 1;// NPOptionManager::getInstance()->GetVerboseLevel();
+std::vector<int> NPL::InputBlock::GetVectorInt(std::string Token) {
+ int verbose = 1; // NPOptionManager::getInstance()->GetVerboseLevel();
std::stringstream iss(GetValue(Token));
std::vector<int> val;
int buffer;
- while(iss>>buffer)
+ while (iss >> buffer)
val.push_back(buffer);
- if(verbose){
- printf(" %s: ",Token.c_str());
- //std::cout << " " << Token << ": ";
- for(unsigned int i = 0 ; i < val.size() ; i++)
- printf(" %d: ",val[i]);
+ if (verbose) {
+ printf(" %s: ", Token.c_str());
+ // std::cout << " " << Token << ": ";
+ for (unsigned int i = 0; i < val.size(); i++)
+ printf(" %d: ", val[i]);
// std::cout << val[i] << " " ;
- std::cout << std::endl;
+ std::cout << std::endl;
}
-
- return val;
+ return val;
}
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
-void NPL::InputParser::Dump(){
- for(unsigned int i = 0 ; i < m_Block.size() ; i++)
+void NPL::InputParser::Dump() {
+ for (unsigned int i = 0; i < m_Block.size(); i++)
m_Block[i]->Dump();
}
////////////////////////////////////////////////////////////////////////////////
-bool NPL::InputParser::IsNotComment(std::string line){
+bool NPL::InputParser::IsNotComment(std::string line) {
line = StripSpaces(line);
- if(line.length()==0)
+ if (line.length() == 0)
return false;
std::size_t pos = line.find("%");
- if(pos==std::string::npos)
+ if (pos == std::string::npos)
return true;
else
return false;
}
////////////////////////////////////////////////////////////////////////////////
-std::vector<NPL::InputBlock*> NPL::InputParser::GetAllBlocksWithToken(std::string Token){
+std::vector<NPL::InputBlock*> NPL::InputParser::GetAllBlocksWithToken(std::string Token) {
std::vector<NPL::InputBlock*> res;
- for(unsigned int i = 0 ; i < m_Block.size(); i++){
- if(m_Block[i]->GetMainToken() == Token){
+ for (unsigned int i = 0; i < m_Block.size(); i++) {
+ if (m_Block[i]->GetMainToken() == Token) {
res.push_back(m_Block[i]);
}
}
return res;
-
}
////////////////////////////////////////////////////////////////////////////////
-std::vector<NPL::InputBlock*> NPL::InputParser::GetAllBlocksWithTokenAndValue(std::string Token,std::string Value){
+std::vector<NPL::InputBlock*> NPL::InputParser::GetAllBlocksWithTokenAndValue(std::string Token, std::string Value) {
std::vector<NPL::InputBlock*> res;
- for(unsigned int i = 0 ; i < m_Block.size(); i++){
- if(m_Block[i]->GetMainToken() == Token){
- if(m_Block[i]->GetMainValue() == Value)
+ for (unsigned int i = 0; i < m_Block.size(); i++) {
+ if (m_Block[i]->GetMainToken() == Token) {
+ if (m_Block[i]->GetMainValue() == Value)
res.push_back(m_Block[i]);
}
}
@@ -349,20 +351,20 @@ std::vector<NPL::InputBlock*> NPL::InputParser::GetAllBlocksWithTokenAndValue(st
}
////////////////////////////////////////////////////////////////////////////////
-std::vector<std::string> NPL::InputParser::GetAllBlocksToken(){
+std::vector<std::string> NPL::InputParser::GetAllBlocksToken() {
std::vector<std::string> token;
- for(unsigned int i = 0 ; i < m_Block.size() ; i++){
+ for (unsigned int i = 0; i < m_Block.size(); i++) {
token.push_back(m_Block[i]->GetMainToken());
}
return token;
}
////////////////////////////////////////////////////////////////////////////////
-std::vector<std::string> NPL::InputParser::GetAllBlocksValues(std::string token){
+std::vector<std::string> NPL::InputParser::GetAllBlocksValues(std::string token) {
std::vector<std::string> value;
std::vector<NPL::InputBlock*> blocks = GetAllBlocksWithToken(token);
unsigned int size = blocks.size();
- for(unsigned int i = 0 ; i < size ; i++){
+ for (unsigned int i = 0; i < size; i++) {
value.push_back(blocks[i]->GetMainValue());
}
@@ -370,74 +372,73 @@ std::vector<std::string> NPL::InputParser::GetAllBlocksValues(std::string token)
}
////////////////////////////////////////////////////////////////////////////////
-void NPL::InputParser::TreatAliases(){
+void NPL::InputParser::TreatAliases() {
// Call the alias block
std::vector<NPL::InputBlock*> alias = GetAllBlocksWithToken("Alias");
- // List of token:
+ // List of token:
- // - Action
+ // - Action
// -> Split : create new block for each value
// -> Inplace : Replace the value in existing alias
// - Value -> The list of value to be used
- std::vector<std::string> token = {"Action","Value"};
- for(unsigned int i = 0 ; i < alias.size() ; i++){
- if(!alias[i]->HasTokenList(token)){
+ std::vector<std::string> token = {"Action", "Value"};
+ for (unsigned int i = 0; i < alias.size(); i++) {
+ if (!alias[i]->HasTokenList(token)) {
NPL::SendErrorAndExit("NPL::InputParser", "Alias block syntax incorrect");
}
-
- int verbose = 1; //NPOptionManager::getInstance()->GetVerboseLevel();
- if(verbose)
+ int verbose = 1; // NPOptionManager::getInstance()->GetVerboseLevel();
+
+ if (verbose)
std::cout << "Using Alias : @" << alias[i]->GetMainValue() << std::endl;
-
- std::string name="@";
- name += alias[i]->GetMainValue();
+
+ std::string name = "@";
+ name += alias[i]->GetMainValue();
std::string action = alias[i]->GetString("Action");
- std::vector<std::string> value = alias[i]->GetVectorString("Value");
- if(action=="Replace" && value.size()!=1)
- NPL::SendErrorAndExit("NPL::InputParser", "Inplace alias can only take one value");
+ std::vector<std::string> value = alias[i]->GetVectorString("Value");
+ if (action == "Replace" && value.size() != 1)
+ NPL::SendErrorAndExit("NPL::InputParser", "Inplace alias can only take one value");
// Scan all blocks for aliases
- for(unsigned int b = 0 ; b < m_Block.size() ; b++){
+ for (unsigned int b = 0; b < m_Block.size(); b++) {
unsigned int size = m_Block[b]->GetSize();
- size_t pos;
+ size_t pos;
// In place case loop over each value and replace them
- if(action=="Replace"){
- for(unsigned int v = 0 ; v < size ; v++){
- while((pos=m_Block[b]->GetValue(v).find(name))!=std::string::npos){
+ if (action == "Replace") {
+ for (unsigned int v = 0; v < size; v++) {
+ while ((pos = m_Block[b]->GetValue(v).find(name)) != std::string::npos) {
std::string val = m_Block[b]->GetValue(v);
- val.replace(pos,name.length(),value[0]);
- m_Block[b]->SetValue(v,val);
+ val.replace(pos, name.length(), value[0]);
+ m_Block[b]->SetValue(v, val);
}
}
}
- else if (action=="Copy"){
+ else if (action == "Copy") {
bool check = false;
// first pass identify if the block use an alias
- for(unsigned int v = 0 ; v < size ; v++){
- if(m_Block[b]->GetValue(v).find(name)!=std::string::npos)
- check = true;
+ for (unsigned int v = 0; v < size; v++) {
+ if (m_Block[b]->GetValue(v).find(name) != std::string::npos)
+ check = true;
}
- if(check){
+ if (check) {
NPL::InputBlock* originalBlock = m_Block[b]->Copy();
- for(unsigned int a = 0 ; a < value.size() ; a++){
+ for (unsigned int a = 0; a < value.size(); a++) {
NPL::InputBlock* newBlock = originalBlock->Copy();
- for(unsigned int v = 0 ; v < size ; v++){
- while((pos=newBlock->GetValue(v).find(name))!=std::string::npos){
+ for (unsigned int v = 0; v < size; v++) {
+ while ((pos = newBlock->GetValue(v).find(name)) != std::string::npos) {
std::string val = newBlock->GetValue(v);
- val.replace(pos,name.length(),value[a]);
- newBlock->SetValue(v,val);
+ val.replace(pos, name.length(), value[a]);
+ newBlock->SetValue(v, val);
}
-
}
- if(a==0){
+ if (a == 0) {
m_Block[b] = newBlock;
}
- else{
+ else {
std::vector<NPL::InputBlock*>::iterator it = m_Block.begin();
- m_Block.insert(it+b+a,newBlock);
+ m_Block.insert(it + b + a, newBlock);
}
}
}
@@ -446,16 +447,16 @@ void NPL::InputParser::TreatAliases(){
}
}
////////////////////////////////////////////////////////////////////////////////
-void NPL::InputParser::ReadFile(std::string filename,bool ExitOnError){
+void NPL::InputParser::ReadFile(std::string filename, bool ExitOnError) {
Clear();
std::ifstream file(filename.c_str());
- if(!file.is_open()){
+ if (!file.is_open()) {
std::ostringstream message;
message << "file " << filename << " not found " << std::endl;
- if(ExitOnError)
+ if (ExitOnError)
NPL::SendErrorAndExit("NPL::InputParser", message.str());
- else{
+ else {
NPL::SendWarning("NPL::InputParser", message.str());
return;
}
@@ -463,28 +464,28 @@ void NPL::InputParser::ReadFile(std::string filename,bool ExitOnError){
std::string line;
NPL::InputBlock* block = 0;
- while(!file.eof()){
- getline(file,line);
- if(IsNotComment(line) && GetLevel(line)==0) {
- if(block)
+ while (!file.eof()) {
+ getline(file, line);
+ if (IsNotComment(line) && GetLevel(line) == 0) {
+ if (block)
m_Block.push_back(block);
block = new NPL::InputBlock(line);
- if(!file.eof())
- getline(file,line);
+ if (!file.eof())
+ getline(file, line);
}
- if(block && IsNotComment(line)){
+ if (block && IsNotComment(line)) {
block->AddLine(line);
}
}
// Add the last block
- if(block)
+ if (block)
m_Block.push_back(block);
TreatAliases();
}
////////////////////////////////////////////////////////////////////////////////
-void NPL::InputParser::Clear(){
- for(unsigned int i = 0 ; m_Block.size() ; i++)
+void NPL::InputParser::Clear() {
+ for (unsigned int i = 0; m_Block.size(); i++)
delete m_Block[i];
m_Block.clear();
@@ -492,479 +493,479 @@ void NPL::InputParser::Clear(){
}
////////////////////////////////////////////////////////////////////////////////
-double NPL::ApplyUnit(double value, std::string unit){
- if(unit=="void") // apply no unit
+double NPL::ApplyUnit(double value, std::string unit) {
+ if (unit == "void") // apply no unit
return value;
- else if(unit=="g/cm3"){
- return value*NPUNITS::g/NPUNITS::cm3;
+ else if (unit == "g/cm3") {
+ return value * NPUNITS::g / NPUNITS::cm3;
}
- else if(unit=="kg/cm3"){
- return value*NPUNITS::kg/NPUNITS::cm3;
+ else if (unit == "kg/cm3") {
+ return value * NPUNITS::kg / NPUNITS::cm3;
}
-
- else if(unit=="millimeter"){
- return value*NPUNITS::millimeter;
+
+ else if (unit == "millimeter") {
+ return value * NPUNITS::millimeter;
}
- else if(unit=="millimeter2"){
- return value*NPUNITS::millimeter2;
+ else if (unit == "millimeter2") {
+ return value * NPUNITS::millimeter2;
}
- else if(unit=="millimeter3"){
- return value*NPUNITS::millimeter3;
+ else if (unit == "millimeter3") {
+ return value * NPUNITS::millimeter3;
}
- else if(unit=="centimeter"){
- return value*NPUNITS::centimeter;
+ else if (unit == "centimeter") {
+ return value * NPUNITS::centimeter;
}
- else if(unit=="centimeter2"){
- return value*NPUNITS::centimeter2;
+ else if (unit == "centimeter2") {
+ return value * NPUNITS::centimeter2;
}
- else if(unit=="centimeter3"){
- return value*NPUNITS::centimeter3;
+ else if (unit == "centimeter3") {
+ return value * NPUNITS::centimeter3;
}
- else if(unit=="meter"){
- return value*NPUNITS::meter;
+ else if (unit == "meter") {
+ return value * NPUNITS::meter;
}
- else if(unit=="meter2"){
- return value*NPUNITS::meter2;
+ else if (unit == "meter2") {
+ return value * NPUNITS::meter2;
}
- else if(unit=="meter3"){
- return value*NPUNITS::meter3;
+ else if (unit == "meter3") {
+ return value * NPUNITS::meter3;
}
- else if(unit=="kilometer"){
- return value*NPUNITS::kilometer;
+ else if (unit == "kilometer") {
+ return value * NPUNITS::kilometer;
}
- else if(unit=="kilometer2"){
- return value*NPUNITS::kilometer2;
+ else if (unit == "kilometer2") {
+ return value * NPUNITS::kilometer2;
}
- else if(unit=="kilometer3"){
- return value*NPUNITS::kilometer3;
+ else if (unit == "kilometer3") {
+ return value * NPUNITS::kilometer3;
}
- else if(unit=="parsec"){
- return value*NPUNITS::parsec;
+ else if (unit == "parsec") {
+ return value * NPUNITS::parsec;
}
- else if(unit=="micrometer"){
- return value*NPUNITS::micrometer;
+ else if (unit == "micrometer") {
+ return value * NPUNITS::micrometer;
}
- else if(unit=="nanometer"){
- return value*NPUNITS::nanometer;
+ else if (unit == "nanometer") {
+ return value * NPUNITS::nanometer;
}
- else if(unit=="angstrom"){
- return value*NPUNITS::angstrom;
+ else if (unit == "angstrom") {
+ return value * NPUNITS::angstrom;
}
- else if(unit=="fermi"){
- return value*NPUNITS::fermi;
+ else if (unit == "fermi") {
+ return value * NPUNITS::fermi;
}
- else if(unit=="barn"){
- return value*NPUNITS::barn;
+ else if (unit == "barn") {
+ return value * NPUNITS::barn;
}
- else if(unit=="millibarn"){
- return value*NPUNITS::millibarn;
+ else if (unit == "millibarn") {
+ return value * NPUNITS::millibarn;
}
- else if(unit=="microbarn"){
- return value*NPUNITS::microbarn;
+ else if (unit == "microbarn") {
+ return value * NPUNITS::microbarn;
}
- else if(unit=="nanobarn"){
- return value*NPUNITS::nanobarn;
+ else if (unit == "nanobarn") {
+ return value * NPUNITS::nanobarn;
}
- else if(unit=="picobarn"){
- return value*NPUNITS::picobarn;
+ else if (unit == "picobarn") {
+ return value * NPUNITS::picobarn;
}
- else if(unit=="mm"){
- return value*NPUNITS::mm;
+ else if (unit == "mm") {
+ return value * NPUNITS::mm;
}
- else if(unit=="um"){
- return value*NPUNITS::um;
+ else if (unit == "um") {
+ return value * NPUNITS::um;
}
- else if(unit=="nm"){
- return value*NPUNITS::nm;
+ else if (unit == "nm") {
+ return value * NPUNITS::nm;
}
- else if(unit=="mm2"){
- return value*NPUNITS::mm2;
+ else if (unit == "mm2") {
+ return value * NPUNITS::mm2;
}
- else if(unit=="mm3"){
- return value*NPUNITS::mm3;
+ else if (unit == "mm3") {
+ return value * NPUNITS::mm3;
}
- else if(unit=="cm"){
- return value*NPUNITS::cm;
+ else if (unit == "cm") {
+ return value * NPUNITS::cm;
}
- else if(unit=="cm2"){
- return value*NPUNITS::cm2;
+ else if (unit == "cm2") {
+ return value * NPUNITS::cm2;
}
- else if(unit=="cm3"){
- return value*NPUNITS::cm3;
+ else if (unit == "cm3") {
+ return value * NPUNITS::cm3;
}
- else if(unit=="m"){
- return value*NPUNITS::m;
+ else if (unit == "m") {
+ return value * NPUNITS::m;
}
- else if(unit=="m2"){
- return value*NPUNITS::m2;
+ else if (unit == "m2") {
+ return value * NPUNITS::m2;
}
- else if(unit=="m3"){
- return value*NPUNITS::m3;
+ else if (unit == "m3") {
+ return value * NPUNITS::m3;
}
- else if(unit=="km"){
- return value*NPUNITS::km;
+ else if (unit == "km") {
+ return value * NPUNITS::km;
}
- else if(unit=="km2"){
- return value*NPUNITS::km2;
+ else if (unit == "km2") {
+ return value * NPUNITS::km2;
}
- else if(unit=="km3"){
- return value*NPUNITS::km3;
+ else if (unit == "km3") {
+ return value * NPUNITS::km3;
}
- else if(unit=="pc"){
- return value*NPUNITS::pc;
+ else if (unit == "pc") {
+ return value * NPUNITS::pc;
}
- else if(unit=="radian"){
- return value*NPUNITS::radian;
+ else if (unit == "radian") {
+ return value * NPUNITS::radian;
}
- else if(unit=="milliradian"){
- return value*NPUNITS::milliradian;
+ else if (unit == "milliradian") {
+ return value * NPUNITS::milliradian;
}
- else if(unit=="degree"){
- return value*NPUNITS::degree;
+ else if (unit == "degree") {
+ return value * NPUNITS::degree;
}
- else if(unit=="steradian"){
- return value*NPUNITS::steradian;
+ else if (unit == "steradian") {
+ return value * NPUNITS::steradian;
}
- else if(unit=="rad"){
- return value*NPUNITS::rad;
+ else if (unit == "rad") {
+ return value * NPUNITS::rad;
}
- else if(unit=="mrad"){
- return value*NPUNITS::mrad;
+ else if (unit == "mrad") {
+ return value * NPUNITS::mrad;
}
- else if(unit=="sr"){
- return value*NPUNITS::sr;
+ else if (unit == "sr") {
+ return value * NPUNITS::sr;
}
- else if(unit=="deg"){
- return value*NPUNITS::deg;
+ else if (unit == "deg") {
+ return value * NPUNITS::deg;
}
- else if(unit=="nanosecond"){
- return value*NPUNITS::nanosecond;
+ else if (unit == "nanosecond") {
+ return value * NPUNITS::nanosecond;
}
- else if(unit=="second"){
- return value*NPUNITS::second;
+ else if (unit == "second") {
+ return value * NPUNITS::second;
}
- else if(unit=="millisecond"){
- return value*NPUNITS::millisecond;
+ else if (unit == "millisecond") {
+ return value * NPUNITS::millisecond;
}
- else if(unit=="microsecond"){
- return value*NPUNITS::microsecond;
+ else if (unit == "microsecond") {
+ return value * NPUNITS::microsecond;
}
- else if(unit=="picosecond"){
- return value*NPUNITS::picosecond;
+ else if (unit == "picosecond") {
+ return value * NPUNITS::picosecond;
}
- else if(unit=="hertz"){
- return value*NPUNITS::hertz;
+ else if (unit == "hertz") {
+ return value * NPUNITS::hertz;
}
- else if(unit=="kilohertz"){
- return value*NPUNITS::kilohertz;
+ else if (unit == "kilohertz") {
+ return value * NPUNITS::kilohertz;
}
- else if(unit=="megahertz"){
- return value*NPUNITS::megahertz;
+ else if (unit == "megahertz") {
+ return value * NPUNITS::megahertz;
}
- else if(unit=="ns"){
- return value*NPUNITS::ns;
+ else if (unit == "ns") {
+ return value * NPUNITS::ns;
}
- else if(unit=="us"){
- return value*NPUNITS::us;
+ else if (unit == "us") {
+ return value * NPUNITS::us;
}
- else if(unit=="ms"){
- return value*NPUNITS::ms;
+ else if (unit == "ms") {
+ return value * NPUNITS::ms;
}
- else if(unit=="eplus"){
- return value*NPUNITS::eplus;
+ else if (unit == "eplus") {
+ return value * NPUNITS::eplus;
}
- else if(unit=="e_SI"){
- return value*NPUNITS::e_SI;
+ else if (unit == "e_SI") {
+ return value * NPUNITS::e_SI;
}
- else if(unit=="coulomb"){
- return value*NPUNITS::coulomb;
+ else if (unit == "coulomb") {
+ return value * NPUNITS::coulomb;
}
- else if(unit=="megaelectron"){
- return value*NPUNITS::megaelectronvolt;
+ else if (unit == "megaelectron") {
+ return value * NPUNITS::megaelectronvolt;
}
- else if(unit=="electronvolt"){
- return value*NPUNITS::electronvolt;
+ else if (unit == "electronvolt") {
+ return value * NPUNITS::electronvolt;
}
- else if(unit=="kiloelectron"){
- return value*NPUNITS::kiloelectronvolt;
+ else if (unit == "kiloelectron") {
+ return value * NPUNITS::kiloelectronvolt;
}
- else if(unit=="gigaelectron"){
- return value*NPUNITS::gigaelectronvolt;
+ else if (unit == "gigaelectron") {
+ return value * NPUNITS::gigaelectronvolt;
}
- else if(unit=="teraelectron"){
- return value*NPUNITS::teraelectronvolt;
+ else if (unit == "teraelectron") {
+ return value * NPUNITS::teraelectronvolt;
}
- else if(unit=="petaelectron"){
- return value*NPUNITS::petaelectronvolt;
+ else if (unit == "petaelectron") {
+ return value * NPUNITS::petaelectronvolt;
}
- else if(unit=="joule"){
- return value*NPUNITS::joule;
+ else if (unit == "joule") {
+ return value * NPUNITS::joule;
}
- else if(unit=="MeV"){
- return value*NPUNITS::MeV;
+ else if (unit == "MeV") {
+ return value * NPUNITS::MeV;
}
- else if(unit=="eV"){
- return value*NPUNITS::eV;
+ else if (unit == "eV") {
+ return value * NPUNITS::eV;
}
- else if(unit=="keV"){
- return value*NPUNITS::keV;
+ else if (unit == "keV") {
+ return value * NPUNITS::keV;
}
- else if(unit=="GeV"){
- return value*NPUNITS::GeV;
+ else if (unit == "GeV") {
+ return value * NPUNITS::GeV;
}
- else if(unit=="TeV"){
- return value*NPUNITS::TeV;
+ else if (unit == "TeV") {
+ return value * NPUNITS::TeV;
}
- else if(unit=="PeV"){
- return value*NPUNITS::PeV;
+ else if (unit == "PeV") {
+ return value * NPUNITS::PeV;
}
- else if(unit=="kilogram"){
- return value*NPUNITS::kilogram;
+ else if (unit == "kilogram") {
+ return value * NPUNITS::kilogram;
}
- else if(unit=="gram"){
- return value*NPUNITS::gram;
+ else if (unit == "gram") {
+ return value * NPUNITS::gram;
}
- else if(unit=="milligram"){
- return value*NPUNITS::milligram;
+ else if (unit == "milligram") {
+ return value * NPUNITS::milligram;
}
- else if(unit=="kg"){
- return value*NPUNITS::kg;
+ else if (unit == "kg") {
+ return value * NPUNITS::kg;
}
- else if(unit=="g"){
- return value*NPUNITS::g;
+ else if (unit == "g") {
+ return value * NPUNITS::g;
}
- else if(unit=="mg"){
- return value*NPUNITS::mg;
+ else if (unit == "mg") {
+ return value * NPUNITS::mg;
}
- else if(unit=="watt"){
- return value*NPUNITS::watt;
+ else if (unit == "watt") {
+ return value * NPUNITS::watt;
}
- else if(unit=="newton"){
- return value*NPUNITS::newton;
+ else if (unit == "newton") {
+ return value * NPUNITS::newton;
}
- else if(unit=="hep_pascal"){
- return value*NPUNITS::hep_pascal;
+ else if (unit == "hep_pascal") {
+ return value * NPUNITS::hep_pascal;
}
- else if(unit=="bar"){
- return value*NPUNITS::bar;
+ else if (unit == "bar") {
+ return value * NPUNITS::bar;
}
- else if(unit=="atmosphere"){
- return value*NPUNITS::atmosphere;
+ else if (unit == "atmosphere") {
+ return value * NPUNITS::atmosphere;
}
- else if(unit=="ampere"){
- return value*NPUNITS::ampere;
+ else if (unit == "ampere") {
+ return value * NPUNITS::ampere;
}
- else if(unit=="milliampere"){
- return value*NPUNITS::milliampere;
+ else if (unit == "milliampere") {
+ return value * NPUNITS::milliampere;
}
- else if(unit=="microampere"){
- return value*NPUNITS::microampere;
+ else if (unit == "microampere") {
+ return value * NPUNITS::microampere;
}
- else if(unit=="nanoampere"){
- return value*NPUNITS::nanoampere;
+ else if (unit == "nanoampere") {
+ return value * NPUNITS::nanoampere;
}
- else if(unit=="megavolt"){
- return value*NPUNITS::megavolt;
+ else if (unit == "megavolt") {
+ return value * NPUNITS::megavolt;
}
- else if(unit=="kilovolt"){
- return value*NPUNITS::kilovolt;
+ else if (unit == "kilovolt") {
+ return value * NPUNITS::kilovolt;
}
- else if(unit=="volt"){
- return value*NPUNITS::volt;
+ else if (unit == "volt") {
+ return value * NPUNITS::volt;
}
- else if(unit=="ohm"){
- return value*NPUNITS::ohm;
+ else if (unit == "ohm") {
+ return value * NPUNITS::ohm;
}
- else if(unit=="farad"){
- return value*NPUNITS::farad;
+ else if (unit == "farad") {
+ return value * NPUNITS::farad;
}
- else if(unit=="millifarad"){
- return value*NPUNITS::millifarad;
+ else if (unit == "millifarad") {
+ return value * NPUNITS::millifarad;
}
- else if(unit=="microfarad"){
- return value*NPUNITS::microfarad;
+ else if (unit == "microfarad") {
+ return value * NPUNITS::microfarad;
}
- else if(unit=="nanofarad"){
- return value*NPUNITS::nanofarad;
+ else if (unit == "nanofarad") {
+ return value * NPUNITS::nanofarad;
}
- else if(unit=="picofarad"){
- return value*NPUNITS::picofarad;
+ else if (unit == "picofarad") {
+ return value * NPUNITS::picofarad;
}
- else if(unit=="weber"){
- return value*NPUNITS::weber;
+ else if (unit == "weber") {
+ return value * NPUNITS::weber;
}
- else if(unit=="tesla" || unit=="T"){
- return value*NPUNITS::tesla;
+ else if (unit == "tesla" || unit == "T") {
+ return value * NPUNITS::tesla;
}
- else if(unit=="gauss"){
- return value*NPUNITS::gauss;
+ else if (unit == "gauss") {
+ return value * NPUNITS::gauss;
}
- else if(unit=="kilogauss"){
- return value*NPUNITS::kilogauss;
+ else if (unit == "kilogauss") {
+ return value * NPUNITS::kilogauss;
}
- else if(unit=="henry"){
- return value*NPUNITS::henry;
+ else if (unit == "henry") {
+ return value * NPUNITS::henry;
}
- else if(unit=="kelvin"){
- return value*NPUNITS::kelvin;
+ else if (unit == "kelvin") {
+ return value * NPUNITS::kelvin;
}
- else if(unit=="mole"){
- return value*NPUNITS::mole;
+ else if (unit == "mole") {
+ return value * NPUNITS::mole;
}
- else if(unit=="becquerel"){
- return value*NPUNITS::becquerel;
+ else if (unit == "becquerel") {
+ return value * NPUNITS::becquerel;
}
- else if(unit=="curie"){
- return value*NPUNITS::curie;
+ else if (unit == "curie") {
+ return value * NPUNITS::curie;
}
- else if(unit=="gray"){
- return value*NPUNITS::gray;
+ else if (unit == "gray") {
+ return value * NPUNITS::gray;
}
- else if(unit=="kilogray"){
- return value*NPUNITS::kilogray;
+ else if (unit == "kilogray") {
+ return value * NPUNITS::kilogray;
}
- else if(unit=="milligray"){
- return value*NPUNITS::milligray;
+ else if (unit == "milligray") {
+ return value * NPUNITS::milligray;
}
- else if(unit=="microgray"){
- return value*NPUNITS::microgray;
+ else if (unit == "microgray") {
+ return value * NPUNITS::microgray;
}
- else if(unit=="candela"){
- return value*NPUNITS::candela;
+ else if (unit == "candela") {
+ return value * NPUNITS::candela;
}
- else if(unit=="lumen"){
- return value*NPUNITS::lumen;
+ else if (unit == "lumen") {
+ return value * NPUNITS::lumen;
}
- else if(unit=="lux"){
- return value*NPUNITS::lux;
+ else if (unit == "lux") {
+ return value * NPUNITS::lux;
}
- else if(unit=="perCent"){
- return value*NPUNITS::perCent;
+ else if (unit == "perCent") {
+ return value * NPUNITS::perCent;
}
- else if(unit=="perThousand"){
- return value*NPUNITS::perThousand;
+ else if (unit == "perThousand") {
+ return value * NPUNITS::perThousand;
}
- else if(unit=="perMillion"){
- return value*NPUNITS::perMillion;
+ else if (unit == "perMillion") {
+ return value * NPUNITS::perMillion;
}
- else{
+ else {
std::cout << "WARNING: Unknown unit " << unit << std::endl;
return value;
}
diff --git a/NPLib/Core/NPInputParser.h b/NPLib/Core/NPInputParser.h
index 2c58e7d482bb318eb13d3e9fc7d5345c0f5ea96e..788dd3ec763a624b90065ba95db48d959bb223e7 100644
--- a/NPLib/Core/NPInputParser.h
+++ b/NPLib/Core/NPInputParser.h
@@ -22,17 +22,15 @@
* *
*****************************************************************************/
-
// STL
-#include<string>
-#include<vector>
-#include<map>
+#include <map>
+#include <string>
+#include <vector>
// ROOT
-#include"TVector3.h"
-
+#include "TVector3.h"
-namespace NPL{
+namespace NPL {
static std::string token_separator = "=";
std::string StripSpaces(std::string line);
@@ -40,85 +38,84 @@ namespace NPL{
double ApplyUnit(double value, std::string unit);
unsigned int GetLevel(std::string line);
- class InputBlock{
- public:
- InputBlock(){};
- InputBlock(std::string line);
- ~InputBlock(){};
- NPL::InputBlock* Copy();
-
- private:
- unsigned int m_Level;
- std::string m_MainToken;
- std::string m_MainValue;
- std::vector<std::string> m_Token;
- std::vector<std::string> m_Value;
- std::vector<std::string> m_Lines;
-
- public:
- void AddLine(std::string line);
- std::string ExtractToken(std::string line,std::string separator="");
- std::string ExtractValue(std::string line,std::string separator="");
-
- public:
- std::string GetToken(unsigned int i){return m_Token[i];};
- std::string GetValue(unsigned int i){return m_Value[i];};
- std::string GetValue(std::string Token);
- void SetValue(unsigned int i, std::string val){m_Value[i]=val;};
-
-
- public:
- bool HasTokenList(std::vector<std::string> TokenList);
- bool HasToken(std::string Token);
-
- public:
- std::string GetMainToken(){return m_MainToken;};
- std::string GetMainValue(){return m_MainValue;};
-
- unsigned int GetSize(){return m_Token.size();};
- double GetDouble(std::string Token,std::string default_unit);
- int GetInt(std::string Token);
- std::string GetString(std::string Token);
- TVector3 GetTVector3(std::string Token,std::string default_unit);
- std::vector<double> GetVectorDouble(std::string Token,std::string default_unit);
- std::vector<int> GetVectorInt(std::string Token);
- std::vector<std::string> GetVectorString(std::string Token);
- std::vector<NPL::InputBlock*> GetSubBlock(std::string Token);
- std::vector<std::string> GetLines(){return m_Lines;};
-
- public:
- void Dump();
+ class InputBlock {
+ public:
+ InputBlock(){};
+ InputBlock(std::string line);
+ ~InputBlock(){};
+ NPL::InputBlock* Copy();
+
+ private:
+ unsigned int m_Level;
+ std::string m_MainToken;
+ std::string m_MainValue;
+ std::vector<std::string> m_Token;
+ std::vector<std::string> m_Value;
+ std::vector<std::string> m_Lines;
+
+ public:
+ void AddLine(std::string line);
+ std::string ExtractToken(std::string line, std::string separator = "");
+ std::string ExtractValue(std::string line, std::string separator = "");
+
+ public:
+ std::string GetToken(unsigned int i) { return m_Token[i]; };
+ std::string GetValue(unsigned int i) { return m_Value[i]; };
+ std::string GetValue(std::string Token);
+ void SetValue(unsigned int i, std::string val) { m_Value[i] = val; };
+
+ public:
+ bool HasTokenList(std::vector<std::string> TokenList);
+ std::vector<std::string> GetMissingToken(std::vector<std::string> TokenList);
+ bool HasToken(std::string Token);
+
+ public:
+ std::string GetMainToken() { return m_MainToken; };
+ std::string GetMainValue() { return m_MainValue; };
+
+ unsigned int GetSize() { return m_Token.size(); };
+ double GetDouble(std::string Token, std::string default_unit);
+ int GetInt(std::string Token);
+ std::string GetString(std::string Token);
+ TVector3 GetTVector3(std::string Token, std::string default_unit);
+ std::vector<double> GetVectorDouble(std::string Token, std::string default_unit);
+ std::vector<int> GetVectorInt(std::string Token);
+ std::vector<std::string> GetVectorString(std::string Token);
+ std::vector<NPL::InputBlock*> GetSubBlock(std::string Token);
+ std::vector<std::string> GetLines() { return m_Lines; };
+
+ public:
+ void Dump();
};
////////////////////////////////////////////////////////////////////////////////
- class InputParser{
- public:
- InputParser(){};
- InputParser(std::string filename,bool ExitOnError=true) {ReadFile(filename,ExitOnError);}
- ~InputParser(){};
-
- private:
- std::vector<InputBlock*> m_Block;
- std::map<std::string, std::vector<std::string> > m_Aliases;
-
- private:
- int m_verbose;
-
- public:
- void ReadFile(std::string filename,bool ExitOnError=true);
- void TreatAliases();
- void TreatOneAlias(){};
- void Dump();
- void Print() {Dump();}
- void Clear();
- std::vector<InputBlock*> GetAllBlocksWithToken(std::string Token);
- std::vector<InputBlock*> GetAllBlocksWithTokenAndValue(std::string Token,std::string Value);
- std::vector<std::string> GetAllBlocksValues(std::string);
- std::vector<std::string> GetAllBlocksToken();
-
-
- private:
- bool IsNotComment(std::string line);
+ class InputParser {
+ public:
+ InputParser(){};
+ InputParser(std::string filename, bool ExitOnError = true) { ReadFile(filename, ExitOnError); }
+ ~InputParser(){};
+
+ private:
+ std::vector<InputBlock*> m_Block;
+ std::map<std::string, std::vector<std::string>> m_Aliases;
+
+ private:
+ int m_verbose;
+
+ public:
+ void ReadFile(std::string filename, bool ExitOnError = true);
+ void TreatAliases();
+ void TreatOneAlias(){};
+ void Dump();
+ void Print() { Dump(); }
+ void Clear();
+ std::vector<InputBlock*> GetAllBlocksWithToken(std::string Token);
+ std::vector<InputBlock*> GetAllBlocksWithTokenAndValue(std::string Token, std::string Value);
+ std::vector<std::string> GetAllBlocksValues(std::string);
+ std::vector<std::string> GetAllBlocksToken();
+
+ private:
+ bool IsNotComment(std::string line);
};
-}
+} // namespace NPL
#endif
diff --git a/NPSimulation/Detectors/Minos/Minos.cc b/NPSimulation/Detectors/Minos/Minos.cc
index 88a18ed5cfae669704d05299c7f060d9558ada3a..ea4ac5d1c96bd5973945fde1e96236420a995aa3 100644
--- a/NPSimulation/Detectors/Minos/Minos.cc
+++ b/NPSimulation/Detectors/Minos/Minos.cc
@@ -323,6 +323,12 @@ void Minos::ReadConfiguration(NPL::InputParser parser) {
}
else {
cout << "ERROR: check your input file formatting " << endl;
+ cout << " missing token : ";
+ auto missing = blocks[i]->GetMissingToken(token);
+ for (unsigned int i = 0; i < missing.size(); i++) {
+ std::cout << missing[i] << " ";
+ }
+ std::cout << endl;
exit(1);
}
}
@@ -333,7 +339,7 @@ void Minos::ReadConfiguration(NPL::InputParser parser) {
// Called After DetecorConstruction::AddDetector Method
void Minos::ConstructDetector(G4LogicalVolume* world) {
for (unsigned short i = 0; i < m_POS.size(); i++) {
- bool TPCOnly = m_TPCOnly[i];
+ TPCOnly = m_TPCOnly[i];
/* TargetMaterial = MaterialManager::getInstance()->GetMaterialFromLibrary("Vacuum"); */
TargetMaterial = MaterialManager::getInstance()->GetMaterialFromLibrary("LH2");
diff --git a/Projects/S034/minos_dali.detector b/Projects/S034/minos_dali.detector
index 2ee456685797fc3455bc9423970269121490652f..facf9c4bf9b2214d7b5d8f632d1581143b53ee3d 100644
--- a/Projects/S034/minos_dali.detector
+++ b/Projects/S034/minos_dali.detector
@@ -2,6 +2,7 @@
Minos
Position= 0 0 0 mm
ZRotation= 40.6 deg
+ TargetZOffset= 0 mm
ZOffset= -4650
TargetLength= 151.72 mm
TargetMaterial= LH2
diff --git a/Projects/S034/s034.detector b/Projects/S034/s034.detector
index 197967682cc07f903a5271da68bb1c96cbef8468..32f48fb1764ff6af96f69d69ecddcab1b233a7e9 100644
--- a/Projects/S034/s034.detector
+++ b/Projects/S034/s034.detector
@@ -27,12 +27,14 @@ Minos
Position= 0.345399 1.02061 -4650 mm
ZRotation= 40.6 deg
TargetLength= 151.72 mm
+ TargetZOffset= 0 mm
+ ZOffset= 0 mm
TargetMaterial= LH2
CellMaterial= Mylar
TPCOnly= 0
TimeBin= 30 ns
ShapingTime= 333.9 ns
- BaseLine= 250
+ Baseline= 250
Sampling= 10
XML= db/MINOS.xml