diff --git a/src/E2Sextupole.cpp b/src/E2Sextupole.cpp index fafca66a7ea1e9222dc6b6fe03ed95e5000c2839..e72c17f8f33c10eb1f00fa37038925ca5dd02323 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: "