From e62e10da8589652cddd27cf6b58a8900ff25663e Mon Sep 17 00:00:00 2001
From: ELATTAOUI <xavier.elattaoui@synchrotron-soleil.fr>
Date: Tue, 10 Jun 2025 11:25:55 +0200
Subject: [PATCH] code clean up
---
conanfile.py | 2 +-
pom.xml | 4 ++--
src/Lakeshore_336.cpp | 37 -------------------------------------
3 files changed, 3 insertions(+), 40 deletions(-)
diff --git a/conanfile.py b/conanfile.py
index 5fc7995..fd00583 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -3,7 +3,7 @@ from conan import ConanFile
class Lakeshore_336Recipe(ConanFile):
name = "lakeshore_336"
executable = "ds_Lakeshore_336"
- version = "1.0.7"
+ version = "1.0.8"
package_type = "application"
user = "soleil"
python_requires = "base/[>=1.0]@soleil/stable"
diff --git a/pom.xml b/pom.xml
index 9264a52..1deca0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
</parent>
<groupId>fr.soleil.device</groupId>
<artifactId>Lakeshore_336-${aol}-${mode}</artifactId>
- <version>1.0.7</version>
+ <version>1.0.8</version>
<packaging>nar</packaging>
<name>Lakeshore_336</name>
<developers>
@@ -47,4 +47,4 @@
<artifactId>YAT-${aol}-${library}-${mode}</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/Lakeshore_336.cpp b/src/Lakeshore_336.cpp
index a0d0184..263e878 100644
--- a/src/Lakeshore_336.cpp
+++ b/src/Lakeshore_336.cpp
@@ -387,43 +387,6 @@ void Lakeshore_336::get_device_property()
yat4tango::PropertyHelper::create_property_if_empty(this, dev_prop, "1000", "Period");
yat4tango::PropertyHelper::create_property_if_empty(this, dev_prop, "1", "LoopNumber");
- // Tango::DbData data_put;
- // if (dev_prop[0].is_empty()==true || comDeviceProxy.find ("must be defined") != std::string::npos)
- // {
- // m_properties_missing = true;
- // m_status_str = "Communication Device Proxy Property not defined [fix and restart device]";
- // Tango::DbDatum property("ComDeviceProxy");
- // property << comDeviceProxy;
- // data_put.push_back(property);
- // FATAL_STREAM << "Lakeshore_336::get_properties() missing property url -set here the IP Address" << endl;
- // }
- // if (dev_prop[1].is_empty() == true)
- // {
- // Tango::DbDatum property("TimeInDeadBand");
- // property << timeInDeadBand;
- // data_put.push_back(property);
- // INFO_STREAM << "Lakeshore_336::get_properties() missing property TimeInDeadband -set to default " << timeInDeadBand << " sec " << endl;
- // }
- // if (dev_prop[2].is_empty() == true)
- // {
- // Tango::DbDatum property("Period");
- // property << period;
- // data_put.push_back(property);
- // INFO_STREAM << "Lakeshore_336::get_properties() missing property Period -set to default 1000 msec value " << period << endl;
- // }
- // if (dev_prop[3].is_empty() == true)
- // {
- // Tango::DbDatum property("LoopNumber");
- // property << loopNumber;
- // data_put.push_back(property);
- // INFO_STREAM << "Lakeshore_336::get_properties() missing property LoopNumber -set to default 1 value " << period << endl;
- // }
-
- // if(!data_put.empty())
- // {
- // get_db_device()->put_property(data_put);
- // }
-
/*----- PROTECTED REGION END -----*/ // Lakeshore_336::get_device_property_after
}
--
GitLab