From 8960eaf96050c264ab2ea0961aba1d4c31acfb31 Mon Sep 17 00:00:00 2001 From: Xavier Elattaoui <xavier.elattaoui@synchrotron-soleil.fr> Date: Tue, 15 Apr 2008 14:04:25 +0000 Subject: [PATCH] xavier : - minor change (std::cout removed) --- src/KeithleyDDCProtocol.cpp | 2 +- src/Keithley_486.cpp | 10 +++++----- src/Keithley_617.cpp | 2 +- src/Keithley_6485.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/KeithleyDDCProtocol.cpp b/src/KeithleyDDCProtocol.cpp index dec49ae..d379bb8 100644 --- a/src/KeithleyDDCProtocol.cpp +++ b/src/KeithleyDDCProtocol.cpp @@ -406,7 +406,7 @@ std::string argout("no data"); cmd_to_send << "U0X" << std::endl; argout = _communication_link->write_read(cmd_to_send.str()); - std::cout << "\n\nKeithleyDDCProtocol::get_raw_status returns *" << argout << "*" << std::ends; +// std::cout << "\n\nKeithleyDDCProtocol::get_raw_status returns *" << argout << "*" << std::ends; return argout; } diff --git a/src/Keithley_486.cpp b/src/Keithley_486.cpp index 979a572..8951221 100644 --- a/src/Keithley_486.cpp +++ b/src/Keithley_486.cpp @@ -242,7 +242,7 @@ std::string Keithley_486::electrometer_status (void) argout = "Keithley Type : " + modelNum + "\n"; //- Display Intensity ('A') tmp = _kstatus.substr(_kstatus.find('A')+1,1); - std::cout << "\nDisplay Intensity = *" << tmp <<"*" << std::endl; +// std::cout << "\nDisplay Intensity = *" << tmp <<"*" << std::endl; if(!XString<short>::convertFromString(tmp)) argout += "Display Intensity : NORMAL\n"; else @@ -253,7 +253,7 @@ std::string Keithley_486::electrometer_status (void) argout += "Display Intensity : OFF\n"; //- Reading Source ('B') tmp = _kstatus.substr(_kstatus.find('B')+1,1); - std::cout << "\nReading Source = *" << tmp <<"*" << std::endl; +// std::cout << "\nReading Source = *" << tmp <<"*" << std::endl; if(!XString<short>::convertFromString(tmp)) argout += "Reading Source : A/D Reading\n"; else @@ -270,7 +270,7 @@ std::string Keithley_486::electrometer_status (void) argout += "Reading Source : Min Data Store Reading\n"; //- Zero check state ('C') tmp = _kstatus.substr(_kstatus.find('C')+1,1); - std::cout << "\nZero check state = *" << tmp <<"*" << std::endl; +// std::cout << "\nZero check state = *" << tmp <<"*" << std::endl; if(XString<short>::convertFromString(tmp)) argout += "Zero Check : Enabled\n"; else @@ -373,7 +373,7 @@ std::string Keithley_486::electrometer_status (void) //- Range ('Rmn') //- check AutoRange tmp = _kstatus.substr(_kstatus.find('R')+1,2); - std::cout << "\ncheck AutoRange = *" << tmp[0] << "*" << std::endl; +// std::cout << "\ncheck AutoRange = *" << tmp[0] << "*" << std::endl; // if(atoi(&tmp[0]) == 0) if(tmp[0] == '0') argout += "Range : AutoRange Disabled\n"; @@ -383,7 +383,7 @@ std::string Keithley_486::electrometer_status (void) // tmp = _kstatus.substr(_kstatus.find('R')+2,1); _range = atoi(&tmp[1]); _rangeStr = K486_rangeValue[_range]; - std::cout << "\nRange = *" << _range <<"*" << ", RangeStr=" << _rangeStr << std::endl; +// std::cout << "\nRange = *" << _range <<"*" << ", RangeStr=" << _rangeStr << std::endl; argout += _rangeStr + "\n"; //- Integration Period ('S') tmp = _kstatus.substr(_kstatus.find('S')+1,1); diff --git a/src/Keithley_617.cpp b/src/Keithley_617.cpp index 2050d01..ff984fc 100644 --- a/src/Keithley_617.cpp +++ b/src/Keithley_617.cpp @@ -249,7 +249,7 @@ std::string Keithley_617::electrometer_status (void) { //- model number : std::string modelNum = _kstatus.substr(0,3); - std::cout<< "\n617 status = " << modelNum << std::endl; +// std::cout<< "\n617 status = " << modelNum << std::endl; //- if not expected data (here model number) if(modelNum.find("617") == std::string::npos) { diff --git a/src/Keithley_6485.cpp b/src/Keithley_6485.cpp index 48bfdd4..a8ced38 100644 --- a/src/Keithley_6485.cpp +++ b/src/Keithley_6485.cpp @@ -192,7 +192,7 @@ std::stringstream cmd_to_send; if(numPLC <= 0 || numPLC > 5.0) { - std::cout << "Keithley_6485::set_knplc -> " << numPLC << std::endl; +// std::cout << "Keithley_6485::set_knplc -> " << numPLC << std::endl; throw electrometer::ElectrometerException("OUT_OF_RANGE", "Invalid number of PLC.\n Please enter a value in the range 0.01 to 5.0.", "Keithley_6485::set_knplc( )."); -- GitLab