Added obsidprefix. Passing imeas to obs meas function.

[phys/latlib.git] / paraq.cpp

diff --git a/paraq.cpp b/paraq.cpp
index ac8fc14ff77ac4897ba082e1b847ce1712f5120a..d512c9c30b911704ef291950cbc871f87d36426c 100644 (file)
--- a/paraq.cpp
+++ b/paraq.cpp
@@ -43,9 +43,22 @@ string paraq::rangeString()
       for( vector<double*>::iterator rangeIt = paraIt->second.begin(); rangeIt != paraIt->second.end(); ++rangeIt)
        rangestring << "-" << paraIt->first << (*rangeIt)[0] << "_" << (*rangeIt)[1] << "_" << (*rangeIt)[2];
   
       for( vector<double*>::iterator rangeIt = paraIt->second.begin(); rangeIt != paraIt->second.end(); ++rangeIt)
        rangestring << "-" << paraIt->first << (*rangeIt)[0] << "_" << (*rangeIt)[1] << "_" << (*rangeIt)[2];
   

+  for (vector<paralink>::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit)
+    rangestring << "-" << linkit->first << "--" << linkit->linktype << "--" << linkit->second;
+

   for( map<string,double>::iterator defIt = defaultPara.begin(); defIt != defaultPara.end(); ++defIt )
   for( map<string,double>::iterator defIt = defaultPara.begin(); defIt != defaultPara.end(); ++defIt )

-    if( rangeMap.find(defIt->first) == rangeMap.end() )
-      rangestring << "-" << defIt->first << defIt->second;
+    if( rangeMap.find(defIt->first) == rangeMap.end() ) {
+      bool linkedpara = false;
+
+      for (vector<paralink>::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit)
+       if (linkit->first == defIt->first) {
+         linkedpara = true;
+         break;
+       }
+
+      if (!linkedpara)
+       rangestring << "-" << defIt->first << defIt->second;
+    }

 
   return rangestring.str();
 }
 
   return rangestring.str();
 }


@@ -81,7 +94,13 @@ void paraq::initJobList()
       while( jobList.begin()->find(paraIt->first) == jobList.begin()->end() ) {
        for( vector<double>::iterator valIt = paraIt->second.begin(); valIt != paraIt->second.end(); ++valIt ) {
          jobList.push_back( *jobList.begin() );
       while( jobList.begin()->find(paraIt->first) == jobList.begin()->end() ) {
        for( vector<double>::iterator valIt = paraIt->second.begin(); valIt != paraIt->second.end(); ++valIt ) {
          jobList.push_back( *jobList.begin() );

+

          jobList.back()[paraIt->first] = *valIt;
          jobList.back()[paraIt->first] = *valIt;

+
+         /* also set linked parameters */
+         for (vector<paralink>::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit)
+           if (linkit->second == paraIt->first)
+             jobList.back()[linkit->first] = linkTypeFunction(*valIt, linkit->linktype);

        }       
        jobList.erase( jobList.begin() );
       }
        }       
        jobList.erase( jobList.begin() );
       }


@@ -89,6 +108,18 @@ void paraq::initJobList()
   }
 }
 
   }
 }
 

+double paraq::linkTypeFunction (double linkval, int linktype) {
+  switch (linktype) {
+
+  case LINK_1TO1:
+    return linkval;
+
+  case LINK_NEGATIVE:
+    return -linkval;
+
+  }
+}
+

 int paraq::nextParas()
 {
   if( thisjob == -1 ) {   
 int paraq::nextParas()
 {
   if( thisjob == -1 ) {   


@@ -114,7 +145,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() {