Implemented new writeout file naming scheme using hashed range string.

[phys/latlib.git] / paraq.cpp

diff --git a/paraq.cpp b/paraq.cpp
index d512c9c30b911704ef291950cbc871f87d36426c..0892962dec620c09928186887c3633602c7d84d7 100644 (file)
--- a/paraq.cpp
+++ b/paraq.cpp
@@ -41,10 +41,10 @@ string paraq::rangeString()
   for( map< string, vector<double*> >::iterator paraIt = rangeMap.begin(); paraIt != rangeMap.end(); ++paraIt )
     if( paraIt->second.size() > 0 )
       for( vector<double*>::iterator rangeIt = paraIt->second.begin(); rangeIt != paraIt->second.end(); ++rangeIt)
   for( map< string, vector<double*> >::iterator paraIt = rangeMap.begin(); paraIt != rangeMap.end(); ++paraIt )
     if( paraIt->second.size() > 0 )
       for( vector<double*>::iterator rangeIt = paraIt->second.begin(); rangeIt != paraIt->second.end(); ++rangeIt)

-       rangestring << "-" << paraIt->first << (*rangeIt)[0] << "_" << (*rangeIt)[1] << "_" << (*rangeIt)[2];
+       rangestring << "_" << paraIt->first << (*rangeIt)[0] << "-" << (*rangeIt)[1] << "-" << (*rangeIt)[2];

   
   for (vector<paralink>::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit)
   
   for (vector<paralink>::iterator linkit = linkedParas.begin(); linkit != linkedParas.end(); ++linkit)

-    rangestring << "-" << linkit->first << "--" << linkit->linktype << "--" << linkit->second;
+    rangestring << "_" << linkit->first << "--" << linkit->linktype << "--" << linkit->second;

 
   for( map<string,double>::iterator defIt = defaultPara.begin(); defIt != defaultPara.end(); ++defIt )
     if( rangeMap.find(defIt->first) == rangeMap.end() ) {
 
   for( map<string,double>::iterator defIt = defaultPara.begin(); defIt != defaultPara.end(); ++defIt )
     if( rangeMap.find(defIt->first) == rangeMap.end() ) {


@@ -57,7 +57,7 @@ string paraq::rangeString()
        }
 
       if (!linkedpara)
        }
 
       if (!linkedpara)

-       rangestring << "-" << defIt->first << defIt->second;
+       rangestring << "_" << defIt->first << defIt->second;

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