From 1d9f02b669763301c808bcce4ad73e203f0f1957 Mon Sep 17 00:00:00 2001
From: Claudio Scafuri <claudio.scafuri@elettra.eu>
Date: Tue, 25 Mar 2025 17:59:45 +0100
Subject: [PATCH] small progress - still incomplete
---
src/E2Sextupole.cpp | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/E2Sextupole.cpp b/src/E2Sextupole.cpp
index fafca66..e72c17f 100644
--- a/src/E2Sextupole.cpp
+++ b/src/E2Sextupole.cpp
@@ -162,8 +162,7 @@ void E2Sextupole::delete_device()
delete cev_current_cb;
if (cev_current_dev)
delete cev_current_dev;
- if (cev)
- delete cev;
+
// ceh/v current and ceh/v model and skew quad model
if (ceh_state_event_id)
@@ -176,10 +175,6 @@ void E2Sextupole::delete_device()
delete ceh_current_cb;
if (ceh_current_dev)
delete ceh_current_dev;
- if (ceh)
- delete ceh;
- if(skewquadrupole)
- delete skewquadrupole;
if (bba_switch_dev)
delete bba_switch_dev;
@@ -300,7 +295,7 @@ void E2Sextupole::init_device()
set_status("wrong EmebddedConfiguration property");
ERROR_STREAM << "wrong EmbeddedConfiguration property: "
<< embeddedConfiguration
- << " [ pure_sext | ceh_cev | bba_ready | sect_with_skew ]";
+ << " [ pure_sext | ceh_cev | bba_ready | sext_with_skew ]";
return; //init failed!
}
@@ -421,7 +416,7 @@ void E2Sextupole::init_device()
}
if (!pure_sext){ //pure sextupole are not connected to psceh and pscev!
try{
- ceh_current_dev = new Tango::DeviceProxy(psCehDeviceName);
+ ceh_current_dev = new Tango::DeviceProxy(psCehDeviceName); //also used for skewquadrupole, permanently or when bba switch active
}
catch (Tango::DevFailed &ex){
ERROR_STREAM << "failed to create Tango device proxy for CEH device: "
--
GitLab