diff --git a/src/super.cpp b/src/super.cpp
index 35d58916210dc07ef8f575bd7c319d801317d91c..22f30268604eb91b041207ef1913c2a68df601e3 100755
--- a/src/super.cpp
+++ b/src/super.cpp
@@ -844,6 +844,9 @@ super::super(QWidget *parent) : QWidget(parent)
cout << "--------------------------------------------------------modNum.compare(17)" << endl;
modNum = "ST";
}
+ if (!modNum.compare("sp")) {
+ modNum = "s";
+ }
if (!modNum.compare("18")) {modNum = "XS";}
if (hvServer) {delete hvServer; hvServer = 0;}
if (!modNum.compare("05")) {
@@ -1108,63 +1111,63 @@ super::super(QWidget *parent) : QWidget(parent)
ui.phi_a_set->setTargets("kst/modrfamp_kst.01/KlystronPhase");
ui.phi_r_set->setTargets("kst/modrfamp_kst.01/KlystronPhaseRelative");
ui.reset_phi->setTargets("kst/modrfamp_kst.01->ResetKlystronPhase");
- ui.voltageSet_Scalar_2->setSource("kst/mod/hv/VoltageSet");
- ui.setVlt->setTargets("kst/mod/hv/VoltageSet");
+ ui.voltageSet_Scalar_2->setSource("kst/mod/hv_kst.01/VoltageSet");
+ ui.setVlt->setTargets("kst/mod/hv_kst.01/VoltageSet");
ui.power->setSource("kst/mod/llrf_kst.01/amp_cav");
ui.power_2->setSource("kst/mod/llrf_kst.01/cav_amp_set");
ui.setPower->setTargets("kst/mod/llrf_kst.01/cav_amp_set");
// general (switch) tab
- ui.ButtonOff->setTargets("kst/modgeneral_kst.01->CmdOff");
- ui.ButtonHeated->setTargets("kst/modgeneral_kst.01->CmdHeated");
- ui.ButtonStandby->setTargets("kst/modgeneral_kst.01->CmdStandby");
- ui.ButtonLowPower->setTargets("kst/modgeneral_kst.01->CmdLowPower");
- ui.ButtonFullPower->setTargets("kst/modmodcond_kst.01->On");
- ui.OFF_Led->setSource("kst/modgeneral_kst.01/Off");
- ui.Heated_Led->setSource("kst/modgeneral_kst.01/Heated");
- ui.Standby_Led->setSource("kst/modgeneral_kst.01/Standby");
- ui.LowPower_Led->setSource("kst/modgeneral_kst.01/LowPower");
- ui.FullPower_Led->setSource("kst/modgeneral_kst.01/FullPower");
- ui.peakI_2->setSource("kst/modscopemod_kst.01/C1TOP");
- ui.voltage_Scalar_2->setSource("kst/mod/hv/Voltage");
- ui.TimeToGo_Viewer->setSource("kst/modgeneral_kst.01/TimeString");
- ui.Interlock_Led->setSource("kst/modgeneral_kst.01/Interlock");
- ui.Timing_Led->setSource("kst/modmodtiming_kst.01/RfBeginEnab");
- ui.Rfamp_Led->setSource("kst/modrfamp_kst.01/IsOn");
- ui.Fault_Viewer->setSource("kst/modsuper_kst.01/ReadLastError");
- ui.ButtonFaultAck->setTargets("kst/modsuper_kst.01->Reset");
+ ui.ButtonOff->setTargets("kst/mod/general_kst.01->CmdOff");
+ ui.ButtonHeated->setTargets("kst/mod/general_kst.01->CmdHeated");
+ ui.ButtonStandby->setTargets("kst/mod/general_kst.01->CmdStandby");
+ ui.ButtonLowPower->setTargets("kst/mod/general_kst.01->CmdLowPower");
+ ui.ButtonFullPower->setTargets("kst/mod/modcond_kst.01->On");
+ ui.OFF_Led->setSource("kst/mod/general_kst.01/Off");
+ ui.Heated_Led->setSource("kst/mod/general_kst.01/Heated");
+ ui.Standby_Led->setSource("kst/mod/general_kst.01/Standby");
+ ui.LowPower_Led->setSource("kst/mod/general_kst.01/LowPower");
+ ui.FullPower_Led->setSource("kst/mod/general_kst.01/FullPower");
+ ui.peakI_2->setSource("kst/mod/scopemod_kst.01/C1TOP");
+ ui.voltage_Scalar_2->setSource("kst/mod/hv_kst.01/Voltage");
+ ui.TimeToGo_Viewer->setSource("kst/mod/general_kst.01/TimeString");
+ ui.Interlock_Led->setSource("kst/mod/general_kst.01/Interlock");
+ ui.Timing_Led->setSource("kst/mod/modtiming_kst.01/RfBeginEnab");
+ ui.Rfamp_Led->setSource("kst/mod/rfamp_kst.01/IsOn");
+ ui.Fault_Viewer->setSource("kst/mod/super_kst.01/ReadLastError");
+ ui.ButtonFaultAck->setTargets("kst/mod/super_kst.01->Reset");
// HV tab
- ui.Ross_ON->setTargets("kst/modross_kst.01->On");
- ui.Ross_Ground->setTargets("kst/mod/hv->Off;kst/modross_kst.01->Off");
- ui.Ross_Position->setSource("kst/modross_kst.01/Position");
+ ui.Ross_ON->setTargets("kst/mod/ross_kst.01->On");
+ ui.Ross_Ground->setTargets("kst/mod/hv_kst.01->Off;kst/modross_kst.01->Off");
+ ui.Ross_Position->setSource("kst/mod/ross_kst.01/Position");
ui.Ross_Interlock_Enable->setSource("kst/interlock/mod_kst.01/StatHvEnable");
ui.Ross_Interlock_Enable->setDisplayMask(QList<unsigned>() << 5);
ui.Ross_Acs_Enable->setDisplayMask(QList<unsigned>() << modNum.toUInt());
- ui.HV_ON->setTargets("kst/modross_kst.01->On;kst/mod/hv->ON");
- ui.HV_OFF->setTargets("kst/mod/hv->Off");
- ui.LowPowerStat->setSource("kst/mod/hv/LowPowerStat");
- ui.voltage_Scalar->setSource("kst/mod/hv/Voltage");
- ui.voltageSet_Scalar->setSource("kst/mod/hv/VoltageSet");
- ui.setVlt_ApplyNumeric->setTargets("kst/mod/hv/VoltageSet");
- ui.current_Scalar->setSource("kst/mod/hv/Current");
- ui.currentSet_Scalar->setSource("kst/mod/hv/CurrentSet");
- ui.setCur_ApplyNumeric->setTargets("kst/mod/hv/CurrentSet");
- ui.RampUp_PushButton_2->setTargets("kst/modmodcond_kst.01->On");
- ui.rampStat->setSource("kst/mod/hv/RampStat");
- ui.timeToFullPower_Scalar->setSource("kst/modgeneral_kst.01/TimeString");
- ui.Stop_PushButton_2->setTargets("kst/modross_kst.01->Stop;kst/mod/hv->Stop");
+ ui.HV_ON->setTargets("kst/mod/ross_kst.01->On;kst/mod/hv_kst.01->ON");
+ ui.HV_OFF->setTargets("kst/mod/hv_kst.01->Off");
+ ui.LowPowerStat->setSource("kst/mod/hv_kst.01/LowPowerStat");
+ ui.voltage_Scalar->setSource("kst/mod/hv_kst.01/Voltage");
+ ui.voltageSet_Scalar->setSource("kst/mod/hv_kst.01/VoltageSet");
+ ui.setVlt_ApplyNumeric->setTargets("kst/mod/hv_kst.01/VoltageSet");
+ ui.current_Scalar->setSource("kst/mod/hv_kst.01/Current");
+ ui.currentSet_Scalar->setSource("kst/mod/hv_kst.01/CurrentSet");
+ ui.setCur_ApplyNumeric->setTargets("kst/mod/hv_kst.01/CurrentSet");
+ ui.RampUp_PushButton_2->setTargets("kst/mod/modcond_kst.01->On");
+ ui.rampStat->setSource("kst/mod/hv_kst.01/RampStat");
+ ui.timeToFullPower_Scalar->setSource("kst/mod/general_kst.01/TimeString");
+ ui.Stop_PushButton_2->setTargets("kst/mod/ross_kst.01->Stop;kst/mod/hv_kst.01->Stop");
// Ramp tab
- ui.default_ramp->setSource("kst/mod/hv/getDefaultRamp");
- ui.ButtonFullPower_2->setTargets("kst/modmodcond_kst.01->On");
- ui.rampDown_ApplyNumeric->setTargets("kst/mod/hv->RampDown");
- ui.Conditioning_State->setSource("kst/modmodcond_kst.01/State");
+ ui.default_ramp->setSource("kst/mod/hv_kst.01/getDefaultRamp");
+ ui.ButtonFullPower_2->setTargets("kst/mod/modcond_kst.01->On");
+ ui.rampDown_ApplyNumeric->setTargets("kst/mod/hv_kst.01->RampDown");
+ ui.Conditioning_State->setSource("kst/mod/modcond_kst.01/State");
// Timing tab
- ui.ThyratronEnable->setSource("kst/modmodtiming_kst.01/ThyratronEnab");
- ui.Thyratron->setSource("kst/modmodtiming_kst.01/Thyratron");
- ui.ThyratronSet->setTargets("kst/modmodtiming_kst.01/Thyratron");
+ ui.ThyratronEnable->setSource("kst/mod/modtiming_kst.01/ThyratronEnab");
+ ui.Thyratron->setSource("kst/mod/modtiming_kst.01/Thyratron");
+ ui.ThyratronSet->setTargets("kst/mod/modtiming_kst.01/Thyratron");
ui.OfflineMode->setSource("kst/timing/rttrigger_mod_kst.01/EnableStaticTriggerShift");
ui.OfflineMode->setTargets("kst/timing/rttrigger_mod_kst.01/EnableStaticTriggerShift");
ui.RfWidthEnable->setSource("kst/mod/llrf_kst.01/pulse_state");
@@ -1173,18 +1176,18 @@ super::super(QWidget *parent) : QWidget(parent)
ui.RfEndEnable->setSource("kst/mod/llrf_kst.01/pulse_state");
ui.RfEnd->setSource("kst/mod/llrf_kst.01/RfEnd");
ui.RfEndSet->setTargets("kst/mod/llrf_kst.01/RfEnd");
- ui.ThyratronInterlock->setSource("kst/modmodtiming_kst.01/HvFault");
+ ui.ThyratronInterlock->setSource("kst/mod/modtiming_kst.01/HvFault");
ui.RfInterlock->setSource("kst/mod/llrf_kst.01/Interlock_state");
- ui.ResetInterlock->setTargets("kst/mod/llrf_kst.01->ResetInterlock;kst/modmodtiming_kst.01->Reset;kst/interlock/mod_kst.01->Acknowledge");
+ ui.ResetInterlock->setTargets("kst/mod/llrf_kst.01->ResetInterlock;kst/mod/modtiming_kst.01->Reset;kst/interlock/mod_kst.01->Acknowledge");
ui.rfReverseAB_2->setNumColumns(2);
ui.rfReverseAB_2->setDisplayMask("2,3");
ui.rfReverseAB_2->setSource("kst/interlock/mod_kst.01/StatRfTrigger");
- ui.ThyratronOn->setTargets("kst/modmodtiming_kst.01->ThyMeaOn");
- ui.ThyratronOff->setTargets("kst/modmodtiming_kst.01->ThyMeaOff");
- ui.Rfamp_Led_2->setSource("kst/modrfamp_kst.01/IsOn");
- ui.rfamp_reset_2->setTargets("kst/modrfamp_kst.01->ResetReversePower");
- ui.RfOff->setTargets("kst/modmodtiming_kst.01->RfOff");
- ui.RfOn->setTargets("kst/modmodtiming_kst.01->RfOn;kst/interlock/mod_kst->Ackmod");
+ ui.ThyratronOn->setTargets("kst/mod/modtiming_kst.01->ThyMeaOn");
+ ui.ThyratronOff->setTargets("kst/mod/modtiming_kst.01->ThyMeaOff");
+ ui.Rfamp_Led_2->setSource("kst/mod/rfamp_kst.01/IsOn");
+ ui.rfamp_reset_2->setTargets("kst/mod/rfamp_kst.01->ResetReversePower");
+ ui.RfOff->setTargets("kst/mod/modtiming_kst.01->RfOff");
+ ui.RfOn->setTargets("kst/mod/modtiming_kst.01->RfOn;kst/interlock/mod_kst->Ackmod");
ui.klyfil_state_k4->setSource("kst/power_supply/psklyfil_kst.01/State"); // renaming
ui.RfRev->setSource("kst/mod/llrf_kst.01/RfReverse");
@@ -1193,49 +1196,49 @@ super::super(QWidget *parent) : QWidget(parent)
ui.thyfil_enable->setDisplayMask("7");
ui.thyfil_psk_stat->setSource("kst/interlock/mod_kst.01/StatHvEnable");
ui.thyfil_psk_stat->setDisplayMask("6");
- ui.thyfil_vlt->setSource("kst/modthyfil_kst.01/Voltage");
- ui.thyfil_cur->setSource("kst/modthyfil_kst.01/Current");
- ui.thyfil_off->setTargets("kst/modthyfil_kst.01->Off");
- ui.thyfil_isOff->setSource("kst/modthyfil_kst.01/IsOff");
- ui.thyfil_on->setTargets("kst/modthyfil_kst.01->On");
- ui.thyfil_isOn->setSource("kst/modthyfil_kst.01/IsOn");
- ui.thyfil_reset->setTargets("kst/modthyfil_kst.01->Reset");
+ ui.thyfil_vlt->setSource("kst/mod/thyfil_kst.01/Voltage");
+ ui.thyfil_cur->setSource("kst/mod/thyfil_kst.01/Current");
+ ui.thyfil_off->setTargets("kst/mod/thyfil_kst.01->Off");
+ ui.thyfil_isOff->setSource("kst/mod/thyfil_kst.01/IsOff");
+ ui.thyfil_on->setTargets("kst/mod/thyfil_kst.01->On");
+ ui.thyfil_isOn->setSource("kst/mod/thyfil_kst.01/IsOn");
+ ui.thyfil_reset->setTargets("kst/mod/thyfil_kst.01->Reset");
ui.klyfil_enable->setSource("kst/interlock/mod_kst.01/StatHvEnable");
ui.klyfil_enable->setDisplayMask("9");
ui.klyfil_psk_stat->show();
ui.klyfil_psk_stat->setSource("kst/interlock/mod_kst.01/StatHvEnable");
ui.klyfil_psk_stat->setDisplayMask("8");
- ui.klyfil_vlt->setSource("kst/modklyfil_kst.01/Voltage");
- ui.klyfil_cur->setSource("kst/modklyfil_kst.01/Current");
- ui.klyfil_vlt->setSource("kst/modklyfil_kst.01/Voltage");
- ui.klyfil_cur->setSource("kst/modklyfil_kst.01/Current");
- ui.klyfil_off->setTargets("kst/modklyfil_kst.01->Off");
- ui.klyfil_isOff->setSource("kst/modklyfil_kst.01/IsOff");
- ui.klyfil_80->setTargets("kst/modklyfil_kst.01->Standby");
- ui.klyfil_is80->setSource("kst/modklyfil_kst.01/Is80");
- ui.klyfil_100->setTargets("kst/modklyfil_kst.01->On");
- ui.klyfil_is100->setSource("kst/modklyfil_kst.01/Is100");
- ui.klyfil_reset->setTargets("kst/modklyfil_kst.01->Reset");
+ ui.klyfil_vlt->setSource("kst/mod/klyfil_kst.01/Voltage");
+ ui.klyfil_cur->setSource("kst/mod/klyfil_kst.01/Current");
+ ui.klyfil_vlt->setSource("kst/mod/klyfil_kst.01/Voltage");
+ ui.klyfil_cur->setSource("kst/mod/klyfil_kst.01/Current");
+ ui.klyfil_off->setTargets("kst/mod/klyfil_kst.01->Off");
+ ui.klyfil_isOff->setSource("kst/mod/klyfil_kst.01/IsOff");
+ ui.klyfil_80->setTargets("kst/mod/klyfil_kst.01->Standby");
+ ui.klyfil_is80->setSource("kst/mod/klyfil_kst.01/Is80");
+ ui.klyfil_100->setTargets("kst/mod/klyfil_kst.01->On");
+ ui.klyfil_is100->setSource("kst/mod/klyfil_kst.01/Is100");
+ ui.klyfil_reset->setTargets("kst/mod/klyfil_kst.01->Reset");
// Pulse tab
ui.kly_vac_fault->setDisplayMask("2");
ui.piri_a_fault->setDisplayMask("3");
ui.piri_b_fault->setDisplayMask("4");
- ui.premag_cur->setSource("kst/modpremag_kst.01/Current");
- ui.premag_off->setTargets("kst/modpremag_kst.01->Off");
- ui.premag_on->setTargets("kst/modpremag_kst.01->On");
- ui.premag_stat->setSource("kst/modpremag_kst.01/State");
+ ui.premag_cur->setSource("kst/mod/premag_kst.01/Current");
+ ui.premag_off->setTargets("kst/mod/premag_kst.01->Off");
+ ui.premag_on->setTargets("kst/mod/premag_kst.01->On");
+ ui.premag_stat->setSource("kst/mod/premag_kst.01/State");
ui.kly_vac_fault->setSource("kst/interlock/mod_kst.01/StatThyTriggerEnable");
ui.piri_a_fault->setSource("kst/interlock/mod_kst.01/StatThyTriggerEnable");
ui.piri_b_fault->setSource("kst/interlock/mod_kst.01/StatThyTriggerEnable");
- ui.reset_piri->setTargets("kst/modrfamp_kst.01->ResetPiri");
- ui.vacuumKly->setSource("kst/modklyfil_kst.01/KlystronPressure");
- ui.vacuumKlyInt->setSource("kst/modklyfil_kst.01/KlystronPressureIntegrated");
- ui.KlyCollTemp->setSource("kst/modklyfil_kst.01/KlystronCollectorTemperature");
- ui.peakI->setSource("kst/modscopemod_kst.01/C1TOP");
- ui.revI->setSource("kst/modscopemod_kst.01/C1PKPK");
- ui.reset_pi->setTargets("kst/modklyfil_kst.01->ResetIonicPump");
+ ui.reset_piri->setTargets("kst/mod/rfamp_kst.01->ResetPiri");
+ ui.vacuumKly->setSource("kst/mod/klyfil_kst.01/KlystronPressure");
+ ui.vacuumKlyInt->setSource("kst/mod/klyfil_kst.01/KlystronPressureIntegrated");
+ ui.KlyCollTemp->setSource("kst/mod/klyfil_kst.01/KlystronCollectorTemperature");
+ ui.peakI->setSource("kst/mod/scopemod_kst.01/C1TOP");
+ ui.revI->setSource("kst/mod/scopemod_kst.01/C1PKPK");
+ ui.reset_pi->setTargets("kst/mod/klyfil_kst.01->ResetIonicPump");
// SF6 tab
ui.SF6Press->setSource("kst/interlock/sf6_kst.01/SF6Press");
@@ -1251,13 +1254,13 @@ super::super(QWidget *parent) : QWidget(parent)
ui.frame_sf6_ctf->hide();
// Misc tab
- ui.repetition_rate->setSource("kst/modmodfreq_kst.01/Frequency");
- cmd_rfamp_on->setTargets("kst/modrfamp_kst.01->On");
- cmd_rfamp_off->setTargets("kst/modrfamp_kst.01->Off");
+ ui.repetition_rate->setSource("kst/mod/modfreq_kst.01/Frequency");
+ cmd_rfamp_on->setTargets("kst/mod/rfamp_kst.01->On");
+ cmd_rfamp_off->setTargets("kst/mod/rfamp_kst.01->Off");
ui.rfamp_stat->unsetSource(); ui.rfamp_stat->setText(" ");
cout << "read_bit(mioServer, 15): " << read_bit(mioServer, 15) << endl;
if (read_bit(mioServer, 15)==1) {ui.rfamp_stat->setText("ON");mypalette.setColor(QPalette::Window, QColor("#80ff80"));} else {ui.rfamp_stat->setText("OFF");mypalette.setColor(QPalette::Window, QColor("#ffffff"));} ui.rfamp_stat->setPalette(mypalette);
- ui.rfamp_reset->setTargets("kst/modrfamp_kst.01->ResetReversePower");
+ ui.rfamp_reset->setTargets("kst/mod/rfamp_kst.01->ResetReversePower");
ui.rfReverseAB->setNumColumns(1);
ui.rfReverseAB->setDisplayMask("12");
ui.rfReverseAB->setSource("kst/interlock/mod_kst.01/StatThyTriggerEnable");
@@ -1271,9 +1274,9 @@ super::super(QWidget *parent) : QWidget(parent)
ui.foc_stat_2_label->setText("2");
ui.foc_stat_3_label->setText("3");
ui.reset_k4->setTargets("k16/interlock/foc_k16.01->DeltaAlarmRestart");
- ui.fug_begin->setSource("kst/modmodtiming_kst.01/FugBegin");
- ui.fug_width->setSource("kst/modmodtiming_kst.01/FugWidth");
- ui.fug_polarity->setSource("kst/modmodtiming_kst.01/FugPolarity");
+ ui.fug_begin->setSource("kst/mod/modtiming_kst.01/FugBegin");
+ ui.fug_width->setSource("kst/mod/modtiming_kst.01/FugWidth");
+ ui.fug_polarity->setSource("kst/mod/modtiming_kst.01/FugPolarity");
ui.RnmMode->setSource("kst/mod/llrf_kst.01/RnmMode");
ui.RnmMode->setTargets("kst/mod/llrf_kst.01/RnmMode");
ui.tertiaryLabel->show();
@@ -1281,12 +1284,12 @@ super::super(QWidget *parent) : QWidget(parent)
if (llrfServer) {delete llrfServer; llrfServer = 0;}
connectDevice("kst/mod/llrf_kst.01", &llrfServer);
if (timingServer) {delete timingServer; timingServer = 0;}
- connectDevice("kst/modmodtiming_kst.01", &timingServer);
+ connectDevice("kst/mod/modtiming_kst.01", &timingServer);
if (hvServer) {delete hvServer; hvServer = 0;}
- connectDevice("kst/mod/hv", &hvServer);
+ connectDevice("kst/mod/hv_kst.01", &hvServer);
if (condServer) {delete condServer; condServer = 0;}
- connectDevice("kst/modmodcond_kst.01", &condServer);
- ui.ResetInterlock->setTargets("kst/modmodtiming_kst.01->Reset;k16/interlock/mod_k16.01->Acknowledge");
+ connectDevice("kst/mod/modcond_kst.01", &condServer);
+ ui.ResetInterlock->setTargets("kst/mod/modtiming_kst.01->Reset;k16/interlock/mod_k16.01->Acknowledge");
}
else if (!modNum.compare("16")) {
// kst/interlock/mod_kst -> k16/interlock/mod_k16.01
@@ -1297,64 +1300,64 @@ super::super(QWidget *parent) : QWidget(parent)
ui.SF6Close->hide();
ui.SF6Stat->hide();
// main tab
- ui.phi_a->setSource("k16/mod/rfamp/KlystronPhase");
- ui.phi_r->setSource("k16/mod/rfamp/KlystronPhaseRelative");
- ui.phi_a_set->setTargets("k16/mod/rfamp/KlystronPhase");
- ui.phi_r_set->setTargets("k16/mod/rfamp/KlystronPhaseRelative");
- ui.reset_phi->setTargets("k16/mod/rfamp->ResetKlystronPhase");
- ui.voltageSet_Scalar_2->setSource("k16/mod/hv/VoltageSet");
- ui.setVlt->setTargets("k16/mod/hv/VoltageSet");
+ ui.phi_a->setSource("k16/mod/rfamp_k16.01/KlystronPhase");
+ ui.phi_r->setSource("k16/mod/rfamp_k16.01/KlystronPhaseRelative");
+ ui.phi_a_set->setTargets("k16/mod/rfamp_k16.01/KlystronPhase");
+ ui.phi_r_set->setTargets("k16/mod/rfamp_k16.01/KlystronPhaseRelative");
+ ui.reset_phi->setTargets("k16/mod/rfamp_k16.01->ResetKlystronPhase");
+ ui.voltageSet_Scalar_2->setSource("k16/mod/hv_k16.01/VoltageSet");
+ ui.setVlt->setTargets("k16/mod/hv_k16.01/VoltageSet");
ui.power->setSource("k16/mod/llrf_k16.01/amp_cav");
ui.power_2->setSource("k16/mod/llrf_k16.01/cav_amp_set");
ui.setPower->setTargets("k16/mod/llrf_k16.01/cav_amp_set");
// general (switch) tab
- ui.ButtonOff->setTargets("k16/mod/general->CmdOff");
- ui.ButtonHeated->setTargets("k16/mod/general->CmdHeated");
- ui.ButtonStandby->setTargets("k16/mod/general->CmdStandby");
- ui.ButtonLowPower->setTargets("k16/mod/general->CmdLowPower");
- ui.ButtonFullPower->setTargets("k16/mod/modcond->On");
- ui.OFF_Led->setSource("k16/mod/general/Off");
- ui.Heated_Led->setSource("k16/mod/general/Heated");
- ui.Standby_Led->setSource("k16/mod/general/Standby");
- ui.LowPower_Led->setSource("k16/mod/general/LowPower");
- ui.FullPower_Led->setSource("k16/mod/general/FullPower");
+ ui.ButtonOff->setTargets("k16/mod/general_k16.01->CmdOff");
+ ui.ButtonHeated->setTargets("k16/mod/general_k16.01->CmdHeated");
+ ui.ButtonStandby->setTargets("k16/mod/general_k16.01->CmdStandby");
+ ui.ButtonLowPower->setTargets("k16/mod/general_k16.01->CmdLowPower");
+ ui.ButtonFullPower->setTargets("k16/mod/modcond_k16.01->On");
+ ui.OFF_Led->setSource("k16/mod/general_k16.01/Off");
+ ui.Heated_Led->setSource("k16/mod/general_k16.01/Heated");
+ ui.Standby_Led->setSource("k16/mod/general_k16.01/Standby");
+ ui.LowPower_Led->setSource("k16/mod/general_k16.01/LowPower");
+ ui.FullPower_Led->setSource("k16/mod/general_k16.01/FullPower");
// ui.peakI_2->setSource("k16/mod/scopemod_kst.01/C1TOP");
ui.peakI_2->unsetSource(); ui.peakI_2->setText(" ");
- ui.voltage_Scalar_2->setSource("k16/mod/hv/Voltage");
- ui.TimeToGo_Viewer->setSource("k16/mod/general/TimeString");
- ui.Interlock_Led->setSource("k16/mod/general/Interlock");
+ ui.voltage_Scalar_2->setSource("k16/mod/hv_k16.01/Voltage");
+ ui.TimeToGo_Viewer->setSource("k16/mod/general_k16.01/TimeString");
+ ui.Interlock_Led->setSource("k16/mod/general_k16.01/Interlock");
ui.Timing_Led->setSource("k16/mod/modtiming_k16.01/RfBeginEnab");
- ui.Rfamp_Led->setSource("k16/mod/rfamp/IsOn");
- ui.Fault_Viewer->setSource("k16/mod/super/ReadLastError");
- ui.ButtonFaultAck->setTargets("k16/mod/super->Reset");
+ ui.Rfamp_Led->setSource("k16/mod/rfamp_k16.01/IsOn");
+ ui.Fault_Viewer->setSource("k16/mod/super_k16.01/ReadLastError");
+ ui.ButtonFaultAck->setTargets("k16/mod/super_k16.01->Reset");
// HV tab
- ui.Ross_ON->setTargets("k16/mod/ross->On");
- ui.Ross_Ground->setTargets("k16/mod/hv->Off;k16/mod/ross->Off");
- ui.Ross_Position->setSource("k16/mod/ross/Position");
+ ui.Ross_ON->setTargets("k16/mod/ross_k16.01->On");
+ ui.Ross_Ground->setTargets("k16/mod/hv_k16.01->Off;k16/mod/ross_k16.01->Off");
+ ui.Ross_Position->setSource("k16/mod/ross_k16.01/Position");
ui.Ross_Interlock_Enable->setSource("k16/interlock/mod_k16.01/StatCol3Blk2");
ui.Ross_Interlock_Enable->setDisplayMask(QList<unsigned>() << 0);
ui.Ross_Acs_Enable->setDisplayMask(QList<unsigned>() << modNum.toUInt());
- ui.HV_ON->setTargets("k16/mod/ross->On;k16/mod/hv->ON");
- ui.HV_OFF->setTargets("k16/mod/hv->Off");
- ui.LowPowerStat->setSource("k16/mod/hv/LowPowerStat");
- ui.voltage_Scalar->setSource("k16/mod/hv/Voltage");
- ui.voltageSet_Scalar->setSource("k16/mod/hv/VoltageSet");
- ui.setVlt_ApplyNumeric->setTargets("k16/mod/hv/VoltageSet");
- ui.current_Scalar->setSource("k16/mod/hv/Current");
- ui.currentSet_Scalar->setSource("k16/mod/hv/CurrentSet");
- ui.setCur_ApplyNumeric->setTargets("k16/mod/hv/CurrentSet");
- ui.RampUp_PushButton_2->setTargets("k16/mod/modcond->On");
- ui.rampStat->setSource("k16/mod/hv/RampStat");
- ui.timeToFullPower_Scalar->setSource("k16/mod/general/TimeString");
- ui.Stop_PushButton_2->setTargets("k16/mod/ross->Stop;k16/mod/hv->Stop");
+ ui.HV_ON->setTargets("k16/mod/ross_k16.01->On;k16/mod/hv_k16.01->ON");
+ ui.HV_OFF->setTargets("k16/mod/hv_k16.01->Off");
+ ui.LowPowerStat->setSource("k16/mod/hv_k16.01/LowPowerStat");
+ ui.voltage_Scalar->setSource("k16/mod/hv_k16.01/Voltage");
+ ui.voltageSet_Scalar->setSource("k16/mod/hv_k16.01/VoltageSet");
+ ui.setVlt_ApplyNumeric->setTargets("k16/mod/hv_k16.01/VoltageSet");
+ ui.current_Scalar->setSource("k16/mod/hv_k16.01/Current");
+ ui.currentSet_Scalar->setSource("k16/mod/hv_k16.01/CurrentSet");
+ ui.setCur_ApplyNumeric->setTargets("k16/mod/hv_k16.01/CurrentSet");
+ ui.RampUp_PushButton_2->setTargets("k16/mod/modcond_k16.01->On");
+ ui.rampStat->setSource("k16/mod/hv_k16.01/RampStat");
+ ui.timeToFullPower_Scalar->setSource("k16/mod/general_k16.01/TimeString");
+ ui.Stop_PushButton_2->setTargets("k16/mod/ross_k16.01->Stop;k16/mod/hv_k16.01->Stop");
// Ramp tab
- ui.default_ramp->setSource("k16/mod/hv/getDefaultRamp");
- ui.ButtonFullPower_2->setTargets("k16/mod/modcond->On");
- ui.rampDown_ApplyNumeric->setTargets("k16/mod/hv->RampDown");
- ui.Conditioning_State->setSource("k16/mod/modcond/State");
+ ui.default_ramp->setSource("k16/mod/hv_k16.01/getDefaultRamp");
+ ui.ButtonFullPower_2->setTargets("k16/mod/modcond_k16.01->On");
+ ui.rampDown_ApplyNumeric->setTargets("k16/mod/hv_k16.01->RampDown");
+ ui.Conditioning_State->setSource("k16/mod/modcond_k16.01/State");
// Timing tab
ui.ThyratronEnable->setSource("k16/mod/modtiming_k16.01/ThyratronEnab");
@@ -1376,9 +1379,9 @@ super::super(QWidget *parent) : QWidget(parent)
ui.rfReverseAB_2->setSource("k16/interlock/mod_k16.01/StatCol5Blk1");
ui.ThyratronOn->setTargets("k16/mod/modtiming_k16.01->ThyMeaOn");
ui.ThyratronOff->setTargets("k16/mod/modtiming_k16.01->ThyMeaOff");
- ui.Rfamp_Led_2->setSource("k16/mod/rfamp/IsOn");
- ui.rfamp_reset_2->setTargets("k16/mod/rfamp->ResetReversePower");
- ui.RfOff->setTargets("k16/mod/modtiming->RfOff");
+ ui.Rfamp_Led_2->setSource("k16/mod/rfamp_k16.01/IsOn");
+ ui.rfamp_reset_2->setTargets("k16/mod/rfamp_k16.01->ResetReversePower");
+ ui.RfOff->setTargets("k16/mod/modtiming_k16.01->RfOff");
ui.RfOn->setTargets("k16/mod/modtiming_k16.01->RfOn");
ui.klyfil_state_k4->setSource("kst/power_supply/psklyfil_kst.01/State"); // renaming
ui.RfRev->setSource("k16/mod/llrf_k16.01/RfReverse");
@@ -1451,10 +1454,10 @@ super::super(QWidget *parent) : QWidget(parent)
// Misc tab
ui.repetition_rate->setSource("k16/mod/modfreq_k16.01/Frequency");
- cmd_rfamp_on->setTargets("k16/mod/rfamp->On");
- cmd_rfamp_off->setTargets("k16/mod/rfamp->Off");
- ui.rfamp_stat->setSource("k16/mod/rfamp/IsOn");
- ui.rfamp_reset->setTargets("k16/mod/rfamp->ResetReversePower");
+ cmd_rfamp_on->setTargets("k16/mod/rfamp_k16.01->On");
+ cmd_rfamp_off->setTargets("k16/mod/rfamp_k16.01->Off");
+ ui.rfamp_stat->setSource("k16/mod/rfamp_k16.01/IsOn");
+ ui.rfamp_reset->setTargets("k16/mod/rfamp_k16.01->ResetReversePower");
ui.rfReverseAB->setNumColumns(2);
ui.rfReverseAB->setDisplayMask("2,3");
ui.rfReverseAB->setSource("k16/interlock/mod_k16.01/StatCol5Blk1");
@@ -1478,14 +1481,14 @@ super::super(QWidget *parent) : QWidget(parent)
if (llrfServer) {delete llrfServer; llrfServer = 0;}
connectDevice("k16/mod/llrf_k16.01", &llrfServer);
if (timingServer) {delete timingServer; timingServer = 0;}
- connectDevice("k16/mod/modtiming", &timingServer);
+ connectDevice("k16/mod/modtiming_k16.01", &timingServer);
if (hvServer) {delete hvServer; hvServer = 0;}
- connectDevice("k16/mod/hv", &hvServer);
+ connectDevice("k16/mod/hv_k16.01", &hvServer);
if (condServer) {delete condServer; condServer = 0;}
- connectDevice("k16/mod/modcond", &condServer);
- ui.ResetInterlock->setTargets("k16/mod/modtiming->Reset;k16/interlock/mod_k16.01->Acknowledge");
+ connectDevice("k16/mod/modcond_k16.01", &condServer);
+ ui.ResetInterlock->setTargets("k16/mod/modtiming_k16.01->Reset;k16/interlock/mod_k16.01->Acknowledge");
}
- else if (!modNum.compare("sp")) {
+ else if (!modNum.compare("sp") || !modNum.compare("s")) {
ui.MDK_Label->setText("S");
ui.SF6Press->setSource("ks/interlock/sf6_ks.01/SF6Press");
ui.SF6Open->setTargets("ks/interlock/sf6_ks.01->Open");
@@ -1529,7 +1532,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.Standby_Led->setSource("k"+modNum+"/mod/general_k"+modNum+".01/Standby");
ui.LowPower_Led->setSource("k"+modNum+"/mod/general_k"+modNum+".01/LowPower");
ui.FullPower_Led->setSource("k"+modNum+"/mod/general_k"+modNum+".01/FullPower");
- ui.peakI_2->setSource("k"+modNum+"/mod/scope_k"+modNum+".01/C1TOP");
+ ui.peakI_2->setSource("k"+modNum+"/mod/scopemod_k"+modNum+".01/C1TOP");
ui.voltage_Scalar_2->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/Voltage");
ui.TimeToGo_Viewer->setSource("k"+modNum+"/mod/general_k"+modNum+".01/TimeString");
ui.Interlock_Led->setSource("k"+modNum+"/mod/general_k"+modNum+".01/Interlock");
@@ -1643,8 +1646,8 @@ super::super(QWidget *parent) : QWidget(parent)
ui.vacuumKly->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/KlystronPressure");
ui.vacuumKlyInt->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/KlystronPressureIntegrated");
ui.KlyCollTemp->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/KlystronCollectorTemperature");
- ui.peakI->setSource("k"+modNum+"/mod/scope_k"+modNum+".01/C1TOP");
- ui.revI->setSource("k"+modNum+"/mod/scope_k"+modNum+".01/C1PKPK");
+ ui.peakI->setSource("k"+modNum+"/mod/scopemod_k"+modNum+".01/C1TOP");
+ ui.revI->setSource("k"+modNum+"/mod/scopemod_k"+modNum+".01/C1PKPK");
ui.reset_pi->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->ResetIonicPump");
// SF6 tab
@@ -1753,7 +1756,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.Ross_ON->setTargets("k"+modNum+"/mod/ross_k"+modNum+".01->On");
ui.Ross_Ground->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01->Off;k"+modNum+"/mod/ross_k"+modNum+".01->Off");
ui.Ross_Position->setSource("k"+modNum+"/mod/ross_k"+modNum+".01/Position");
- if (!modNum.compare("sp")) {
+ if (!modNum.compare("sp") || !modNum.compare("s")) {
ui.Ross_Interlock_Enable->setSource("ks/interlock/mod_ks.01/StatHvEnable");
}
else {
@@ -1798,7 +1801,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.RfWidthEnable->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/pulse_state");
ui.RfWidth->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/RfLength");
ui.RfWidthSet->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01/RfLength");
- if (!modNum.compare("sp")) {
+ if (!modNum.compare("sp") || !modNum.compare("s")) {
ui.OfflineMode->setSource("ks/timing/rttrigger_mod_ks.01/EnableStaticTriggerShift");
ui.OfflineMode->setTargets("ks/timing/rttrigger_mod_ks.01/EnableStaticTriggerShift");
}
@@ -1807,7 +1810,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.OfflineMode->setTargets("k"+modNum+"/timing/rttrigger_mod_k"+modNum+".01/EnableStaticTriggerShift");
}
- if (!modNum.compare("sp") || !modNum.compare("08") || !modNum.compare("09") || !modNum.compare("10") || !modNum.compare("11") || !modNum.compare("12") || !modNum.compare("13") || !modNum.compare("14") || !modNum.compare("15")) {
+ if (!modNum.compare("sp") || !modNum.compare("s") || !modNum.compare("08") || !modNum.compare("09") || !modNum.compare("10") || !modNum.compare("11") || !modNum.compare("12") || !modNum.compare("13") || !modNum.compare("14") || !modNum.compare("15")) {
ui.RfRevEnable->show();
ui.RfRev->show();
// ui.RfRevSet->show();
@@ -1834,7 +1837,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.ResetInterlock->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->Reset;k"+modNum+"/interlock/mod_k"+modNum+".01->Acknowledge");
ui.rfReverseAB_2->setSource("k04/interlock/mod_k04.01/StatThyTriggerEnable");
}
- else if (!modNum.compare("sp")) {
+ else if (!modNum.compare("sp") || !modNum.compare("s")) {
ui.ResetInterlock->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01->ResetInterlock;k"+modNum+"/mod/modtiming_k"+modNum+".01->Reset;ks/interlock/mod_ks.01->Acknowledge");
ui.rfReverseAB_2->setSource("ks/interlock/mod_ks.01/StatRfTrigger");
}
@@ -1854,7 +1857,7 @@ super::super(QWidget *parent) : QWidget(parent)
sleep(0.2);
// Filaments tab
- if (!modNum.compare("sp")) {
+ if (!modNum.compare("sp") || !modNum.compare("s")) {
ui.RfOn->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->RfOn;ks/interlock/mod_ks.01->Ackmod");
ui.thyfil_enable->setSource("ks/interlock/mod_ks.01/StatHvEnable");
ui.thyfil_enable->setDisplayMask("7");
@@ -1864,7 +1867,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.klyfil_psk_stat->setSource("ks/interlock/mod_ks.01/StatHvEnable");
}
else if (!modNum.compare("ST")) {
- ui.RfOn->setTargets("kst/modmodtiming_kst.01->RfOn;kst/interlock/mod_kst.01->Ackmod");
+ ui.RfOn->setTargets("kst/mod/modtiming_kst.01->RfOn;kst/interlock/mod_kst.01->Ackmod");
ui.thyfil_enable->setSource("kst/interlock/mod_kst.01/StatHvEnable");
ui.thyfil_enable->setDisplayMask("7");
ui.thyfil_psk_stat->setSource("kst/interlock/mod_kst.01/StatHvEnable");
@@ -1873,7 +1876,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.klyfil_psk_stat->setSource("kst/interlock/mod_kst.01/StatHvEnable");
}
else if (!modNum.compare("16")) {
- ui.RfOn->setTargets("kst/modmodtiming_kst.01->RfOn;kst/interlock/mod_kst->Ackmod");
+ ui.RfOn->setTargets("kst/mod/modtiming_kst.01->RfOn;kst/interlock/mod_kst->Ackmod");
ui.thyfil_enable->setSource("kst/interlock/mod_kst.01/StatHvEnable");
ui.thyfil_enable->setDisplayMask("7");
ui.klyfil_enable->setSource("kst/interlock/mod_kst.01/StatHvEnable");
@@ -1934,7 +1937,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.rfamp_stat->setSource("k04/mod/twtrfamp_k04.01/State");
}
else {
- if (!modNum.compare("sp")){
+ if (!modNum.compare("sp") || !modNum.compare("s")){
ui.rfamp_stat->setSource("ks/mod/rfamp_ks.01/IsOn");
}
else {
@@ -1948,7 +1951,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.rfReverseAB->setSource("k04/interlock/mod_k04.01/StatThyTriggerEnable");
ui.reset_k4->setTargets("k04/power_supply/psklyfoc_k04.01->ResetInterlock");
}
- else if (!modNum.compare("sp")) {
+ else if (!modNum.compare("sp") || !modNum.compare("s")) {
ui.rfReverseAB->setSource("ks/interlock/mod_ks.01/StatRfTrigger");
ui.reset_k4->setTargets("ks/interlock/foc_ks.01->DeltaAlarmRestart");
}
@@ -1980,7 +1983,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.rfamp_reset->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->ResetReversePower");
ui.reset_pi->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->ResetIonicPump");
- if (!modNum.compare("sp")) {
+ if (!modNum.compare("sp") || !modNum.compare("s")) {
ui.kly_vac_fault->setSource("ks/interlock/mod_ks.01/StatThyTriggerEnable");
ui.piri_a_fault->setSource("ks/interlock/mod_ks.01/StatThyTriggerEnable");
ui.piri_b_fault->setSource("ks/interlock/mod_ks.01/StatThyTriggerEnable");
@@ -2013,7 +2016,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.piri_b_fault->setDisplayMask("5");
// ui.reset_k4->hide();
ui.frame_sf6_common->hide();
- if (!modNum.compare("sp")) {
+ if (!modNum.compare("sp") || !modNum.compare("s")) {
// ui.peakI->hide();
// ui.revI->hide();
ui.peakI_2->hide();
@@ -2023,11 +2026,11 @@ super::super(QWidget *parent) : QWidget(parent)
// ui.peakI->show();
// ui.revI->show();
ui.peakI_2->show();
- ui.peakI_2->setSource("k"+modNum+"/mod/scope_k"+modNum+".01/C1TOP");
+ ui.peakI_2->setSource("k"+modNum+"/mod/scopemod_k"+modNum+".01/C1TOP");
ui.frame_sf6_ctf->hide();
}
- ui.peakI->setSource("k"+modNum+"/mod/scope_k"+modNum+".01/C1TOP");
- ui.revI->setSource("k"+modNum+"/mod/scope_k"+modNum+".01/C1PKPK");
+ ui.peakI->setSource("k"+modNum+"/mod/scopemod_k"+modNum+".01/C1TOP");
+ ui.revI->setSource("k"+modNum+"/mod/scopemod_k"+modNum+".01/C1PKPK");
ui.tertiaryLabel->hide();
ui.tertiaryInfoButton->hide();
// ui.fug_begin->setSource("f/misc/formulalinac_f/fug_begin_"+(modNum.compare("sp")? modNum: "00"));
@@ -2083,7 +2086,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.TimeToGo_Label_5->show();
// ui.open_scope->show();
}
- else if (!modNum.compare("sp")) {
+ else if (!modNum.compare("sp") || !modNum.compare("s")) {
// ui.open_scope->show();
ui.frame_sf6_common->show();
ui.frame_sf6_ctf->hide();
@@ -2138,7 +2141,7 @@ super::super(QWidget *parent) : QWidget(parent)
}
ui.dequing_label->hide();
ui.dequing_state->hide();
- if (!modNum.compare("sp")) {
+ if (!modNum.compare("sp") || !modNum.compare("s")) {
ui.vacuumKly->show();
ui.vacuumKly_label->show();
ui.vacuumKly->setSource("kgsp/vacuum/sip_kgsp.01/Pressure");
@@ -2289,7 +2292,7 @@ super::super(QWidget *parent) : QWidget(parent)
mySetColor(ui.kxs, mod==18? "#ff7744": "#000000", mod==18? "#555588": "#dddddd");
char modStr[4];
if (mod==0) {
- sprintf(modStr, "sp");
+ sprintf(modStr, "s");
}
else if (mod==18) {
sprintf(modStr, "XS");
@@ -2358,7 +2361,7 @@ super::super(QWidget *parent) : QWidget(parent)
tertiary_process3->kill();
tertiary_process3->waitForFinished(3000);
}
- if (!modNum.compare("sp")) {
+ if (!modNum.compare("sp") || !modNum.compare("s")) {
// tertiary_process->start("tertiary lt/tertiary/cb07_l02.02/TsetPV-C8 lt/tertiary/cb07_l02.02/TsetSP-C8 lt/tertiary/cb07_l02.02/TsetDiff-C8 lt/tertiary/cb07_l02.02/Tset-C8 lt/tertiary/cb07_l02.02/TsetRange-C8 KS-C8");
tertiary_process->start("tertiary lt/tertiary/formula/TsetPV-C8 lt/tertiary/formula/TsetSP-C8 lt/tertiary/formula/TsetDiff-C8 lt/tertiary/formula/POT_In-C8 lt/tertiary/cb07_l02.02/Tset-C8 lt/tertiary/cb07_l02.02/TsetRange-C8 lt/tertiary/formula/TsezDiff-C8 lt/tertiary/formula/POT_Sez-C8 KS-C8");
}
@@ -2435,7 +2438,7 @@ super::super(QWidget *parent) : QWidget(parent)
condvacuum4_process->waitForFinished(3000);
}
- if (!modNum.compare("sp")) {
+ if (!modNum.compare("sp") || !modNum.compare("s")) {
condvacuum1_process->start("vacuumcond ctf/vacuum/sip_ctf.09/Pressure ctf/vacuum/sip_ctf.01/Pressure ctf/vacuum/sip_ctf.02/Pressure ctf/vacuum/sip_ctf.07/Pressure ctf/vacuum/sip_ctf.08/Pressure ctf/vacuum/sip_ctf.10/Pressure KGpump_LTloads_LTboc KS");
condvacuum2_process->start("vacuumcond ctf/vacuum/psnip_ctf.01/Pressure1 ctf/vacuum/psnip_ctf.02/Pressure1 GIT_CTF KS");
}
@@ -2561,7 +2564,7 @@ super::super(QWidget *parent) : QWidget(parent)
intlk_process->kill();
intlk_process->waitForFinished(3000);
}
- intlk_process->start(!modNum.compare("sp")? "linacinterlock-gui 00": (!modNum.compare("ST")? "kstinterlock": (!modNum.compare("XS")? "linacinterlock-gui kxs.01":"linacinterlock-gui "+modNum)));
+ intlk_process->start(!modNum.compare("s")? "linacinterlock-gui 00": (!modNum.compare("ST")? "kstinterlock": (!modNum.compare("XS")? "linacinterlock-gui kxs.01":"linacinterlock-gui "+modNum)));
}
void super::open_rfintlk_info()
@@ -2570,7 +2573,7 @@ super::super(QWidget *parent) : QWidget(parent)
rfintlk_process->kill();
rfintlk_process->waitForFinished(3000);
}
- rfintlk_process->start(!modNum.compare("sp")? "linacinterlock-gui 00 1": (!modNum.compare("ST")? "kstinterlock 1": (!modNum.compare("XS")? "linacinterlock-gui kxs.01 1":"linacinterlock-gui "+modNum+" 1")));
+ rfintlk_process->start(!modNum.compare("s")? "linacinterlock-gui 00 1": (!modNum.compare("ST")? "kstinterlock 1": (!modNum.compare("XS")? "linacinterlock-gui kxs.01 1":"linacinterlock-gui "+modNum+" 1")));
// cout << (modNum.compare("sp")? ("preinjinterlock "+modNum+" 1").toStdString().c_str(): "preinjinterlock 00 1") << endl;
}