added underscore in cacheid check

[phys/latlib.git] / paraq.cpp

diff --git a/paraq.cpp b/paraq.cpp
index 381941f7812dec35e5da058716a98dd62faaffce..87ec7734018bc01a662a1f16ec45a0f36a3f1d63 100644 (file)
--- a/paraq.cpp
+++ b/paraq.cpp
@@ -114,7 +114,8 @@ double& paraq::operator[] (string paraid) {
     return defaultPara[paraid];
   }
 
     return defaultPara[paraid];
   }
 

-  return masterdefault;
+  cerr << "PARAQ: Parameter " << paraid << " does not exist!" << endl << flush;
+  exit(1);

 }
 
 int paraq::getTotalJobs() { 
 }
 
 int paraq::getTotalJobs() { 


@@ -129,3 +130,24 @@ void paraq::uniqueAllParaIdsAdd(const string& paraid) {
 
   allParaIds.push_back(paraid);
 }
 
   allParaIds.push_back(paraid);
 }

+
+string paraq::getParaNames() {
+  stringstream paranames;
+  
+  for (vector<string>::iterator parait = allParaIds.begin(); parait != allParaIds.end(); ++parait)
+    paranames << *parait << ":";
+  
+  return paranames.str();
+}
+
+string paraq::getParaVals() {
+  stringstream paravals;
+
+  for (vector<string>::iterator parait = allParaIds.begin(); parait != allParaIds.end(); ++parait) {
+    if ( parait != allParaIds.begin() )
+      paravals << "\t";
+    paravals << (*this)[*parait];
+  }
+
+  return paravals.str();
+}