Commit 94e862ae authored by Alejandro Homs Puron's avatar Alejandro Homs Puron Committed by operator for beamline
Browse files

Rename Tango class to Lima2Detector

parent ae981b7d
......@@ -7,26 +7,26 @@
file(GLOB_RECURSE header_files "*.hpp")
# Tango DS
add_executable(LimaDetectors
add_executable(Lima2Detectors
ClassFactory.cpp
LimaDetector.cpp
LimaDetectorClass.cpp
LimaDetectorStateMachine.cpp
Lima2Detector.cpp
Lima2DetectorClass.cpp
Lima2DetectorStateMachine.cpp
main.cpp
${header_files}
)
message("TANGO_INCLUDE_DIRS: ${TANGO_INCLUDE_DIRS}")
target_include_directories(LimaDetectors
target_include_directories(Lima2Detectors
PUBLIC ${TANGO_INCLUDE_DIRS}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(LimaDetectors PUBLIC libzmq ${CMAKE_THREAD_LIBS_INIT} ${TANGO_LIBRARIES} ${OMNIORB4_LIBRARIES_sh})
target_link_libraries(Lima2Detectors PUBLIC libzmq ${CMAKE_THREAD_LIBS_INIT} ${TANGO_LIBRARIES} ${OMNIORB4_LIBRARIES_sh})
#set_property(TARGET LimaDetectors PROPERTY INTERPROCEDURAL_OPTIMIZATION False)
#set_property(TARGET Lima2Detectors PROPERTY INTERPROCEDURAL_OPTIMIZATION False)
install(
TARGETS LimaDetectors
TARGETS Lima2Detectors
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
)
\ No newline at end of file
/*----- PROTECTED REGION ID(LimaDetector::ClassFactory.cpp) ENABLED START -----*/
/*----- PROTECTED REGION ID(Lima2Detector::ClassFactory.cpp) ENABLED START -----*/
//=============================================================================
//
// file : ClassFactory.cpp
......@@ -22,18 +22,18 @@
//=============================================================================
#include <tango.h>
#include <LimaDetectorClass.h>
#include <Lima2DetectorClass.h>
// Add class header files if needed
/**
* Create LimaDetector Class singleton and store it in DServer object.
* Create Lima2Detector Class singleton and store it in DServer object.
*/
void Tango::DServer::class_factory()
{
// Add method class init if needed
add_class(LimaDetector_ns::LimaDetectorClass::init("LimaDetector"));
add_class(Lima2Detector_ns::Lima2DetectorClass::init("Lima2Detector"));
}
/*----- PROTECTED REGION END -----*/ // LimaDetector::ClassFactory.cpp
/*----- PROTECTED REGION END -----*/ // Lima2Detector::ClassFactory.cpp
/*----- PROTECTED REGION ID(LimaDetector.cpp) ENABLED START -----*/
/*----- PROTECTED REGION ID(Lima2Detector.cpp) ENABLED START -----*/
//=============================================================================
//
// file : LimaDetector.cpp
// file : Lima2Detector.cpp
//
// description : C++ source for the LimaDetector class and its commands.
// description : C++ source for the Lima2Detector class and its commands.
// The class is derived from Device. It represents the
// CORBA servant object which will be accessed from the
// network. All commands which can be executed on the
// LimaDetector are implemented in this file.
// Lima2Detector are implemented in this file.
//
// project : lima
//
......@@ -23,13 +23,13 @@
//=============================================================================
#include <LimaDetector.h>
#include <LimaDetectorClass.h>
#include <Lima2Detector.h>
#include <Lima2DetectorClass.h>
/*----- PROTECTED REGION END -----*/ // LimaDetector.cpp
/*----- PROTECTED REGION END -----*/ // Lima2Detector.cpp
/**
* LimaDetector class description:
* Lima2Detector class description:
*
*/
......@@ -53,125 +53,125 @@
// FrameCounter | Tango::DevLong Scalar
//================================================================
namespace LimaDetector_ns
namespace Lima2Detector_ns
{
/*----- PROTECTED REGION ID(LimaDetector::namespace_starting) ENABLED START -----*/
/*----- PROTECTED REGION ID(Lima2Detector::namespace_starting) ENABLED START -----*/
// static initializations
/*----- PROTECTED REGION END -----*/ // LimaDetector::namespace_starting
/*----- PROTECTED REGION END -----*/ // Lima2Detector::namespace_starting
//--------------------------------------------------------
/**
* Method : LimaDetector::LimaDetector()
* Method : Lima2Detector::Lima2Detector()
* Description : Constructors for a Tango device
* implementing the classLimaDetector
* implementing the classLima2Detector
*/
//--------------------------------------------------------
LimaDetector::LimaDetector(Tango::DeviceClass *cl, string &s)
Lima2Detector::Lima2Detector(Tango::DeviceClass *cl, string &s)
: TANGO_BASE_CLASS(cl, s.c_str())
{
/*----- PROTECTED REGION ID(LimaDetector::constructor_1) ENABLED START -----*/
/*----- PROTECTED REGION ID(Lima2Detector::constructor_1) ENABLED START -----*/
init_device();
/*----- PROTECTED REGION END -----*/ // LimaDetector::constructor_1
/*----- PROTECTED REGION END -----*/ // Lima2Detector::constructor_1
}
//--------------------------------------------------------
LimaDetector::LimaDetector(Tango::DeviceClass *cl, const char *s)
Lima2Detector::Lima2Detector(Tango::DeviceClass *cl, const char *s)
: TANGO_BASE_CLASS(cl, s)
{
/*----- PROTECTED REGION ID(LimaDetector::constructor_2) ENABLED START -----*/
/*----- PROTECTED REGION ID(Lima2Detector::constructor_2) ENABLED START -----*/
init_device();
/*----- PROTECTED REGION END -----*/ // LimaDetector::constructor_2
/*----- PROTECTED REGION END -----*/ // Lima2Detector::constructor_2
}
//--------------------------------------------------------
LimaDetector::LimaDetector(Tango::DeviceClass *cl, const char *s, const char *d)
Lima2Detector::Lima2Detector(Tango::DeviceClass *cl, const char *s, const char *d)
: TANGO_BASE_CLASS(cl, s, d)
{
/*----- PROTECTED REGION ID(LimaDetector::constructor_3) ENABLED START -----*/
/*----- PROTECTED REGION ID(Lima2Detector::constructor_3) ENABLED START -----*/
init_device();
/*----- PROTECTED REGION END -----*/ // LimaDetector::constructor_3
/*----- PROTECTED REGION END -----*/ // Lima2Detector::constructor_3
}
//--------------------------------------------------------
/**
* Method : LimaDetector::delete_device()
* Method : Lima2Detector::delete_device()
* Description : will be called at device destruction or at init command
*/
//--------------------------------------------------------
void LimaDetector::delete_device()
void Lima2Detector::delete_device()
{
DEBUG_STREAM << "LimaDetector::delete_device() " << device_name << endl;
/*----- PROTECTED REGION ID(LimaDetector::delete_device) ENABLED START -----*/
DEBUG_STREAM << "Lima2Detector::delete_device() " << device_name << endl;
/*----- PROTECTED REGION ID(Lima2Detector::delete_device) ENABLED START -----*/
// Delete device allocated objects
/*----- PROTECTED REGION END -----*/ // LimaDetector::delete_device
/*----- PROTECTED REGION END -----*/ // Lima2Detector::delete_device
delete[] attr_AcqState_read;
delete[] attr_FrameCounter_read;
}
//--------------------------------------------------------
/**
* Method : LimaDetector::init_device()
* Method : Lima2Detector::init_device()
* Description : will be called at device initialization.
*/
//--------------------------------------------------------
void LimaDetector::init_device()
void Lima2Detector::init_device()
{
DEBUG_STREAM << "LimaDetector::init_device() create device " << device_name << endl;
/*----- PROTECTED REGION ID(LimaDetector::init_device_before) ENABLED START -----*/
DEBUG_STREAM << "Lima2Detector::init_device() create device " << device_name << endl;
/*----- PROTECTED REGION ID(Lima2Detector::init_device_before) ENABLED START -----*/
// Initialization before get_device_property() call
/*----- PROTECTED REGION END -----*/ // LimaDetector::init_device_before
/*----- PROTECTED REGION END -----*/ // Lima2Detector::init_device_before
// No device property to be read from database
attr_AcqState_read = new AcqStateEnum[1];
attr_FrameCounter_read = new Tango::DevLong[1];
/*----- PROTECTED REGION ID(LimaDetector::init_device) ENABLED START -----*/
/*----- PROTECTED REGION ID(Lima2Detector::init_device) ENABLED START -----*/
// Initialize device
*attr_AcqState_read = _IDLE;
*attr_FrameCounter_read = 0;
/*----- PROTECTED REGION END -----*/ // LimaDetector::init_device
/*----- PROTECTED REGION END -----*/ // Lima2Detector::init_device
}
//--------------------------------------------------------
/**
* Method : LimaDetector::always_executed_hook()
* Method : Lima2Detector::always_executed_hook()
* Description : method always executed before any command is executed
*/
//--------------------------------------------------------
void LimaDetector::always_executed_hook()
void Lima2Detector::always_executed_hook()
{
DEBUG_STREAM << "LimaDetector::always_executed_hook() " << device_name << endl;
/*----- PROTECTED REGION ID(LimaDetector::always_executed_hook) ENABLED START -----*/
DEBUG_STREAM << "Lima2Detector::always_executed_hook() " << device_name << endl;
/*----- PROTECTED REGION ID(Lima2Detector::always_executed_hook) ENABLED START -----*/
// code always executed before all requests
/*----- PROTECTED REGION END -----*/ // LimaDetector::always_executed_hook
/*----- PROTECTED REGION END -----*/ // Lima2Detector::always_executed_hook
}
//--------------------------------------------------------
/**
* Method : LimaDetector::read_attr_hardware()
* Method : Lima2Detector::read_attr_hardware()
* Description : Hardware acquisition for attributes
*/
//--------------------------------------------------------
void LimaDetector::read_attr_hardware(TANGO_UNUSED(vector<long> &attr_list))
void Lima2Detector::read_attr_hardware(TANGO_UNUSED(vector<long> &attr_list))
{
DEBUG_STREAM << "LimaDetector::read_attr_hardware(vector<long> &attr_list) entering... " << endl;
/*----- PROTECTED REGION ID(LimaDetector::read_attr_hardware) ENABLED START -----*/
DEBUG_STREAM << "Lima2Detector::read_attr_hardware(vector<long> &attr_list) entering... " << endl;
/*----- PROTECTED REGION ID(Lima2Detector::read_attr_hardware) ENABLED START -----*/
// Add your own code
/*----- PROTECTED REGION END -----*/ // LimaDetector::read_attr_hardware
/*----- PROTECTED REGION END -----*/ // Lima2Detector::read_attr_hardware
}
//--------------------------------------------------------
......@@ -183,14 +183,14 @@ void LimaDetector::read_attr_hardware(TANGO_UNUSED(vector<long> &attr_list))
* Attr type: Scalar
*/
//--------------------------------------------------------
void LimaDetector::read_AcqState(Tango::Attribute &attr)
void Lima2Detector::read_AcqState(Tango::Attribute &attr)
{
DEBUG_STREAM << "LimaDetector::read_AcqState(Tango::Attribute &attr) entering... " << endl;
/*----- PROTECTED REGION ID(LimaDetector::read_AcqState) ENABLED START -----*/
DEBUG_STREAM << "Lima2Detector::read_AcqState(Tango::Attribute &attr) entering... " << endl;
/*----- PROTECTED REGION ID(Lima2Detector::read_AcqState) ENABLED START -----*/
// Set the attribute value
attr.set_value(attr_AcqState_read);
/*----- PROTECTED REGION END -----*/ // LimaDetector::read_AcqState
/*----- PROTECTED REGION END -----*/ // Lima2Detector::read_AcqState
}
//--------------------------------------------------------
/**
......@@ -201,30 +201,30 @@ void LimaDetector::read_AcqState(Tango::Attribute &attr)
* Attr type: Scalar
*/
//--------------------------------------------------------
void LimaDetector::read_FrameCounter(Tango::Attribute &attr)
void Lima2Detector::read_FrameCounter(Tango::Attribute &attr)
{
DEBUG_STREAM << "LimaDetector::read_FrameCounter(Tango::Attribute &attr) entering... " << endl;
/*----- PROTECTED REGION ID(LimaDetector::read_FrameCounter) ENABLED START -----*/
DEBUG_STREAM << "Lima2Detector::read_FrameCounter(Tango::Attribute &attr) entering... " << endl;
/*----- PROTECTED REGION ID(Lima2Detector::read_FrameCounter) ENABLED START -----*/
// Set the attribute value
attr.set_value(attr_FrameCounter_read);
/*----- PROTECTED REGION END -----*/ // LimaDetector::read_FrameCounter
/*----- PROTECTED REGION END -----*/ // Lima2Detector::read_FrameCounter
}
//--------------------------------------------------------
/**
* Method : LimaDetector::add_dynamic_attributes()
* Method : Lima2Detector::add_dynamic_attributes()
* Description : Create the dynamic attributes if any
* for specified device.
*/
//--------------------------------------------------------
void LimaDetector::add_dynamic_attributes()
void Lima2Detector::add_dynamic_attributes()
{
/*----- PROTECTED REGION ID(LimaDetector::add_dynamic_attributes) ENABLED START -----*/
/*----- PROTECTED REGION ID(Lima2Detector::add_dynamic_attributes) ENABLED START -----*/
// Add your own code to create and add dynamic attributes if any
/*----- PROTECTED REGION END -----*/ // LimaDetector::add_dynamic_attributes
/*----- PROTECTED REGION END -----*/ // Lima2Detector::add_dynamic_attributes
}
//--------------------------------------------------------
......@@ -235,17 +235,17 @@ void LimaDetector::add_dynamic_attributes()
* @returns
*/
//--------------------------------------------------------
Tango::DevBoolean LimaDetector::prepare()
Tango::DevBoolean Lima2Detector::prepare()
{
Tango::DevBoolean argout;
DEBUG_STREAM << "LimaDetector::Prepare() - " << device_name << endl;
/*----- PROTECTED REGION ID(LimaDetector::prepare) ENABLED START -----*/
DEBUG_STREAM << "Lima2Detector::Prepare() - " << device_name << endl;
/*----- PROTECTED REGION ID(Lima2Detector::prepare) ENABLED START -----*/
// Add your own code
*attr_AcqState_read = _PREPARED;
argout = true;
/*----- PROTECTED REGION END -----*/ // LimaDetector::prepare
/*----- PROTECTED REGION END -----*/ // Lima2Detector::prepare
return argout;
}
//--------------------------------------------------------
......@@ -255,10 +255,10 @@ Tango::DevBoolean LimaDetector::prepare()
*
*/
//--------------------------------------------------------
void LimaDetector::start()
void Lima2Detector::start()
{
DEBUG_STREAM << "LimaDetector::Start() - " << device_name << endl;
/*----- PROTECTED REGION ID(LimaDetector::start) ENABLED START -----*/
DEBUG_STREAM << "Lima2Detector::Start() - " << device_name << endl;
/*----- PROTECTED REGION ID(Lima2Detector::start) ENABLED START -----*/
// Add your own code
m_timer.set_interval([this]() {
......@@ -266,7 +266,7 @@ void LimaDetector::start()
push_change_event("FrameCounter", attr_FrameCounter_read);
}, 10);
/*----- PROTECTED REGION END -----*/ // LimaDetector::start
/*----- PROTECTED REGION END -----*/ // Lima2Detector::start
}
//--------------------------------------------------------
/**
......@@ -275,35 +275,35 @@ void LimaDetector::start()
*
*/
//--------------------------------------------------------
void LimaDetector::stop()
void Lima2Detector::stop()
{
DEBUG_STREAM << "LimaDetector::Stop() - " << device_name << endl;
/*----- PROTECTED REGION ID(LimaDetector::stop) ENABLED START -----*/
DEBUG_STREAM << "Lima2Detector::Stop() - " << device_name << endl;
/*----- PROTECTED REGION ID(Lima2Detector::stop) ENABLED START -----*/
// Add your own code
m_timer.stop();
/*----- PROTECTED REGION END -----*/ // LimaDetector::stop
/*----- PROTECTED REGION END -----*/ // Lima2Detector::stop
}
//--------------------------------------------------------
/**
* Method : LimaDetector::add_dynamic_commands()
* Method : Lima2Detector::add_dynamic_commands()
* Description : Create the dynamic commands if any
* for specified device.
*/
//--------------------------------------------------------
void LimaDetector::add_dynamic_commands()
void Lima2Detector::add_dynamic_commands()
{
/*----- PROTECTED REGION ID(LimaDetector::add_dynamic_commands) ENABLED START -----*/
/*----- PROTECTED REGION ID(Lima2Detector::add_dynamic_commands) ENABLED START -----*/
// Add your own code to create and add dynamic commands if any
/*----- PROTECTED REGION END -----*/ // LimaDetector::add_dynamic_commands
/*----- PROTECTED REGION END -----*/ // Lima2Detector::add_dynamic_commands
}
/*----- PROTECTED REGION ID(LimaDetector::namespace_ending) ENABLED START -----*/
/*----- PROTECTED REGION ID(Lima2Detector::namespace_ending) ENABLED START -----*/
// Additional Methods
/*----- PROTECTED REGION END -----*/ // LimaDetector::namespace_ending
/*----- PROTECTED REGION END -----*/ // Lima2Detector::namespace_ending
} // namespace
/*----- PROTECTED REGION ID(LimaDetector.h) ENABLED START -----*/
/*----- PROTECTED REGION ID(Lima2Detector.h) ENABLED START -----*/
//=============================================================================
//
// file : LimaDetector.h
// file : Lima2Detector.h
//
// description : Include file for the LimaDetector class
// description : Include file for the Lima2Detector class
//
// project : lima
//
......@@ -19,22 +19,22 @@
//=============================================================================
#ifndef LimaDetector_H
#define LimaDetector_H
#ifndef Lima2Detector_H
#define Lima2Detector_H
#include <tango.h>
#include "timer.hpp"
/*----- PROTECTED REGION END -----*/ // LimaDetector.h
/*----- PROTECTED REGION END -----*/ // Lima2Detector.h
/**
* LimaDetector class description:
* Lima2Detector class description:
*
*/
namespace LimaDetector_ns
namespace Lima2Detector_ns
{
enum _AcqStateEnum {
_IDLE,
......@@ -44,22 +44,22 @@ enum _AcqStateEnum {
} ;
typedef _AcqStateEnum AcqStateEnum;
/*----- PROTECTED REGION ID(LimaDetector::Additional Class Declarations) ENABLED START -----*/
/*----- PROTECTED REGION ID(Lima2Detector::Additional Class Declarations) ENABLED START -----*/
// Additional Class Declarations
/*----- PROTECTED REGION END -----*/ // LimaDetector::Additional Class Declarations
/*----- PROTECTED REGION END -----*/ // Lima2Detector::Additional Class Declarations
class LimaDetector : public TANGO_BASE_CLASS
class Lima2Detector : public TANGO_BASE_CLASS
{
/*----- PROTECTED REGION ID(LimaDetector::Data Members) ENABLED START -----*/
/*----- PROTECTED REGION ID(Lima2Detector::Data Members) ENABLED START -----*/
// Add your own data members
private:
timer m_timer;
/*----- PROTECTED REGION END -----*/ // LimaDetector::Data Members
/*----- PROTECTED REGION END -----*/ // Lima2Detector::Data Members
// Attribute data members
......@@ -75,14 +75,14 @@ public:
* @param cl Class.
* @param s Device Name
*/
LimaDetector(Tango::DeviceClass *cl,string &s);
Lima2Detector(Tango::DeviceClass *cl,string &s);
/**
* Constructs a newly device object.
*
* @param cl Class.
* @param s Device Name
*/
LimaDetector(Tango::DeviceClass *cl,const char *s);
Lima2Detector(Tango::DeviceClass *cl,const char *s);
/**
* Constructs a newly device object.
*
......@@ -90,11 +90,11 @@ public:
* @param s Device name
* @param d Device description.
*/
LimaDetector(Tango::DeviceClass *cl,const char *s,const char *d);
Lima2Detector(Tango::DeviceClass *cl,const char *s,const char *d);
/**
* The device object destructor.
*/
~LimaDetector() {delete_device();};
~Lima2Detector() {delete_device();};
// Miscellaneous methods
......@@ -117,7 +117,7 @@ public:
public:
//--------------------------------------------------------
/*
* Method : LimaDetector::read_attr_hardware()
* Method : Lima2Detector::read_attr_hardware()
* Description : Hardware acquisition for attributes.
*/
//--------------------------------------------------------
......@@ -145,7 +145,7 @@ public:
//--------------------------------------------------------
/**
* Method : LimaDetector::add_dynamic_attributes()
* Method : Lima2Detector::add_dynamic_attributes()
* Description : Add dynamic attributes if any.
*/
//--------------------------------------------------------
......@@ -182,25 +182,25 @@ public:
//--------------------------------------------------------
/**
* Method : LimaDetector::add_dynamic_commands()
* Method : Lima2Detector::add_dynamic_commands()
* Description : Add dynamic commands if any.
*/
//--------------------------------------------------------
void add_dynamic_commands();
/*----- PROTECTED REGION ID(LimaDetector::Additional Method prototypes) ENABLED START -----*/
/*----- PROTECTED REGION ID(Lima2Detector::Additional Method prototypes) ENABLED START -----*/
// Additional Method prototypes
/*----- PROTECTED REGION END -----*/ // LimaDetector::Additional Method prototypes
/*----- PROTECTED REGION END -----*/ // Lima2Detector::Additional Method prototypes
};
/*----- PROTECTED REGION ID(LimaDetector::Additional Classes Definitions) ENABLED START -----*/
/*----- PROTECTED REGION ID(Lima2Detector::Additional Classes Definitions) ENABLED START -----*/
// Additional Classes Definitions
/*----- PROTECTED REGION END -----*/ // LimaDetector::Additional Classes Definitions
/*----- PROTECTED REGION END -----*/ // Lima2Detector::Additional Classes Definitions
} // End of namespace
#endif // LimaDetector_H
#endif // Lima2Detector_H
<?xml version="1.0" encoding="ASCII"?>
<pogoDsl:PogoSystem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pogoDsl="http://www.esrf.fr/tango/pogo/PogoDsl">
<classes name="LimaDetector" pogoRevision="9.6">
<classes name="Lima2Detector" pogoRevision="9.6">
<description description="" title="lima" sourcePath="/users/debionne/tango/lima" language="Cpp" filestogenerate="XMI file,Code files,Protected Regions" license="none" copyright="Copyright (C): 2019&#xA; European Synchrotron Radiation Facility&#xA; BP 220, Grenoble 38043&#xA; France" hasMandatoryProperty="false" hasConcreteProperty="false" hasAbstractCommand="false" hasAbstractAttribute="false">
<inheritances classname="Device_Impl" sourcePath=""/>
<identification contact="at esrf.fr - samuel.debionne" author="samuel.debionne" emailDomain="esrf.fr" classFamily="Acquisition" siteSpecific="" platform="All Platforms" bus="Not Applicable" manufacturer="ESRF" reference="Simulator"/>
......
/*----- PROTECTED REGION ID(LimaDetectorClass.cpp) ENABLED START -----*/
/*----- PROTECTED REGION ID(Lima2DetectorClass.cpp) ENABLED START -----*/
//=============================================================================
//
// file : LimaDetectorClass.cpp
// file : Lima2DetectorClass.cpp
//
// description : C++ source for the LimaDetectorClass.
// description : C++ source for the Lima2DetectorClass.
// A singleton class derived from DeviceClass.
// It implements the command and attribute list
// and all properties and methods required
// by the LimaDetector once per process.
// by the Lima2Detector once per process.
//
// project : lima
//
......@@ -23,13 +23,13 @@
//=============================================================================
#include <LimaDetectorClass.h>
#include <Lima2DetectorClass.h>
/*----- PROTECTED REGION END -----*/ // LimaDetectorClass.cpp
/*----- PROTECTED REGION END -----*/ // Lima2DetectorClass.cpp
//-------------------------------------------------------------------
/**
* Create LimaDetectorClass singleton and
* Create Lima2DetectorClass singleton and
* return it in a C function for Python usage
*/
//-------------------------------------------------------------------
......@@ -40,50 +40,50 @@ __declspec(dllexport)
#endif
Tango::DeviceClass *_create_LimaDetector_class(const char *name) {
return LimaDetector_ns::LimaDetectorClass::init(name);
Tango::DeviceClass *_create_Lima2Detector_class(const char *name) {
return Lima2Detector_ns::Lima2DetectorClass::init(name);
}
}
namespace LimaDetector_ns
namespace Lima2Detector_ns
{
//===================================================================
// Initialize pointer for singleton pattern
//===================================================================
LimaDetectorClass *LimaDetectorClass::_instance = NULL;
Lima2DetectorClass *Lima2DetectorClass::_instance = NULL;
//--------------------------------------------------------
/**
* method : LimaDetectorClass::LimaDetectorClass(string &s)
* description : constructor for the LimaDetectorClass
* method : Lima2DetectorClass::Lima2DetectorClass(string &s)
* description : constructor for the Lima2DetectorClass
*
* @param s The class name
*/
//--------------------------------------------------------
LimaDetectorClass::LimaDetectorClass(string &s):Tango::DeviceClass(s)
Lima2DetectorClass::Lima2DetectorClass(string &s):Tango::DeviceClass(s)
{
cout2 << "Entering LimaDetectorClass constructor" << endl;
cout2 << "Entering Lima2DetectorClass constructor" << endl;
set_default_property();
write_class_property();
/*----- PROTECTED REGION ID(LimaDetectorClass::constructor) ENABLED START -----*/