diff --git a/pom.xml b/pom.xml index fd7bbb70b40a005addf72a6fe17625edca6c2b39..b818bae93e8b2ea22ff23abb9333e8d6ee07042c 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ </parent> <groupId>fr.soleil.lib</groupId> <artifactId>Electrometers-${aol}-${library}-${mode}</artifactId> - <version>2.5.2</version> + <version>2.5.3-SNAPSHOT</version> <packaging>nar</packaging> <name>Electrometers library</name> <description>Electrometers library</description> @@ -34,4 +34,18 @@ </build> <dependencies> </dependencies> + <developers> + <developer> + <id>elattaoui</id> + <name>Xavier Elattaoui</name> + <email>xavier.elattaoui@synchrotron-soleil.fr</email> + <url>http://controle/~hardion/</url> + <organization>Synchrotron Soleil</organization> + <organizationUrl>http://www.synchrotron-soleil.fr</organizationUrl> + <roles> + <role>developper</role> + </roles> + <timezone>1</timezone> + </developer> + </developers> </project> diff --git a/src/KeithleySCPIProtocol.cpp b/src/KeithleySCPIProtocol.cpp index a9e3a31bcc241dc5f8e822ecc02b3e61ce0e7aad..b64265563196f6bb40fb11638b0a446ae619c3e1 100644 --- a/src/KeithleySCPIProtocol.cpp +++ b/src/KeithleySCPIProtocol.cpp @@ -469,12 +469,16 @@ short numberOfData = 0; //- posBeg = 0; posEnd = datalist.find(',', posBeg); -//-DEBUG std::cout << "\t*****::buildDataList -> argin :\n$" << datalist << "$" << std::endl; - //- there is just one value + +//-DEBUG +std::cout << "\t*****::buildDataList -> argin :\n$" << datalist << "$" << std::endl; + + //- there is just one value if(posEnd == std::string::npos) { argout.push_back( XString<double>::convertFromString(datalist) ); -//-DEBUG std::cout << "\t*****::buildDataList -> JUST ONE DATA :$" << datalist << "$" << std::endl; +//-DEBUG +std::cout << "\t*****::buildDataList -> JUST ONE DATA :$" << datalist << "$" << std::endl; } else { @@ -486,7 +490,8 @@ short numberOfData = 0; { dataStr = datalist.substr(posBeg,posEnd); argout.push_back( XString<double>::convertFromString(dataStr) ); -//-DEBUG std::cout << "\t*****::buildDataList -> FULL OF DATA : " << i << " -> $" << argout[i] << "$" << std::endl; +//-DEBUG +std::cout << "\t*****::buildDataList -> FULL OF DATA : " << i << " -> $" << argout[i] << "$" << std::endl; posBeg = posEnd+1; posEnd = datalist.find(',', posBeg); @@ -497,7 +502,6 @@ short numberOfData = 0; argout.push_back( XString<double>::convertFromString(dataStr) ); break; } - } }