diff --git a/src/super.cpp b/src/super.cpp
index 74398b0da5bbe0012652bece72e48d59a073e50e..ffb688c43a3d1a1cdb84c9096138131f79356f92 100755
--- a/src/super.cpp
+++ b/src/super.cpp
@@ -961,7 +961,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.RfEndSet->setTargets("kxs/mod/llrf_kxs.01/RfEnd");
ui.ThyratronInterlock->setSource("kxs/mod/modtiming_kxs.01/HvFault");
ui.RfInterlock->setSource("kxs/mod/llrf_kxs.01/Interlock_state");
- ui.ResetInterlock->setTargets("kxs/mod/llrf_kxs.01->ResetInterlock;kxs/mod/modtiming_kxs.01->Reset;f/interlock/mod05->Acknowledge");
+ ui.ResetInterlock->setTargets("kxs/mod/llrf_kxs.01->ResetInterlock;kxs/mod/modtiming_kxs.01->Reset;f/interlock/mod_kxs.01->Acknowledge");
ui.rfReverseAB_2->setNumColumns(2);
ui.rfReverseAB_2->setDisplayMask("12,11");
ui.rfReverseAB_2->setSource("kxs/interlock/mod_kxs.01/StatThyTriggerEnable");
@@ -1044,10 +1044,10 @@ super::super(QWidget *parent) : QWidget(parent)
ui.reset_pi->setTargets("kxs/mod/klyfil_kxs.01->ResetIonicPump");
// SF6 tab
- ui.SF6Press->setSource("f/interlock/sf6_05/SF6Press");
- ui.SF6Open->setTargets("f/interlock/sf6_05->Open");
- ui.SF6Close->setTargets("f/interlock/sf6_05->Close");
- ui.SF6Stat->setSource("f/interlock/sf6_05/StatSF6");
+ ui.SF6Press->setSource("kxs/interlock/mod_kxs.01/SF6Press");
+ ui.SF6Open->setTargets("kxs/interlock/mod_kxs.01->Open");
+ ui.SF6Close->setTargets("kxs/interlock/mod_kxs.01->Close");
+ ui.SF6Stat->setSource("kxs/interlock/mod_kxs.01/StatSF6");
ui.frame_sf6->hide();
ui.SF6Press->show();
ui.SF6Open->show();
@@ -1138,7 +1138,7 @@ super::super(QWidget *parent) : QWidget(parent)
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_Interlock_Enable->setSource("kst/interlock/mod_kst/StatHvEnable");
+ 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");
@@ -1175,10 +1175,10 @@ super::super(QWidget *parent) : QWidget(parent)
ui.RfEndSet->setTargets("kst/mod/llrf_kst.01/RfEnd");
ui.ThyratronInterlock->setSource("kst/modmodtiming_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;f/interlock/mod05->Acknowledge");
+ ui.ResetInterlock->setTargets("kst/mod/llrf_kst.01->ResetInterlock;kst/modmodtiming_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/StatRfTrigger");
+ 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");
@@ -1189,9 +1189,9 @@ super::super(QWidget *parent) : QWidget(parent)
ui.RfRev->setSource("kst/mod/llrf_kst.01/RfReverse");
// Filaments tab
- ui.thyfil_enable->setSource("kst/interlock/mod_kst/StatHvEnable");
+ ui.thyfil_enable->setSource("kst/interlock/mod_kst.01/StatHvEnable");
ui.thyfil_enable->setDisplayMask("7");
- ui.thyfil_psk_stat->setSource("kst/interlock/mod_kst/StatHvEnable");
+ 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");
@@ -1200,10 +1200,10 @@ super::super(QWidget *parent) : QWidget(parent)
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.klyfil_enable->setSource("kst/interlock/mod_kst/StatHvEnable");
+ 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/StatHvEnable");
+ 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");
@@ -1226,9 +1226,9 @@ super::super(QWidget *parent) : QWidget(parent)
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.kly_vac_fault->setSource("kst/interlock/mod_kst/StatThyTriggerEnable");
- ui.piri_a_fault->setSource("kst/interlock/mod_kst/StatThyTriggerEnable");
- ui.piri_b_fault->setSource("kst/interlock/mod_kst/StatThyTriggerEnable");
+ 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");
@@ -1238,10 +1238,10 @@ super::super(QWidget *parent) : QWidget(parent)
ui.reset_pi->setTargets("kst/modklyfil_kst.01->ResetIonicPump");
// SF6 tab
- ui.SF6Press->setSource("kst/interlock/sf6_kst/SF6Press");
- ui.SF6Open->setTargets("kst/interlock/sf6_kst->Open");
- ui.SF6Close->setTargets("kst/interlock/sf6_kst->Close");
- ui.SF6Stat->setSource("kst/interlock/sf6_kst/StatSF6");
+ ui.SF6Press->setSource("kst/interlock/sf6_kst.01/SF6Press");
+ ui.SF6Open->setTargets("kst/interlock/sf6_kst.01->Open");
+ ui.SF6Close->setTargets("kst/interlock/sf6_kst.01->Close");
+ ui.SF6Stat->setSource("kst/interlock/sf6_kst.01/StatSF6");
ui.SF6Press->show();
ui.SF6Open->show();
ui.SF6Close->show();
@@ -1260,7 +1260,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.rfamp_reset->setTargets("kst/modrfamp_kst.01->ResetReversePower");
ui.rfReverseAB->setNumColumns(1);
ui.rfReverseAB->setDisplayMask("12");
- ui.rfReverseAB->setSource("kst/interlock/mod_kst/StatThyTriggerEnable");
+ ui.rfReverseAB->setSource("kst/interlock/mod_kst.01/StatThyTriggerEnable");
ui.rfReverseAB->setTrueColors(ui.rfReverseAB_2->trueColors());
ui.foc_off->setTargets("kst/power_supply/psklyfoc_kst.01->Off;kst/power_supply/psklyfoc_kst.02->Off;kst/power_supply/psklyfoc_kst.03->Off");
ui.foc_on->setTargets("kst/power_supply/psklyfoc_kst.01->On;kst/power_supply/psklyfoc_kst.02->On;kst/power_supply/psklyfoc_kst.03->On");
@@ -1270,7 +1270,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.foc_stat_1_label->setText("1");
ui.foc_stat_2_label->setText("2");
ui.foc_stat_3_label->setText("3");
- ui.reset_k4->setTargets("f/interlock/fock16->DeltaAlarmRestart");
+ 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");
@@ -1286,10 +1286,10 @@ super::super(QWidget *parent) : QWidget(parent)
connectDevice("kst/mod/hv", &hvServer);
if (condServer) {delete condServer; condServer = 0;}
connectDevice("kst/modmodcond_kst.01", &condServer);
- ui.ResetInterlock->setTargets("kst/modmodtiming_kst.01->Reset;f/interlock/modk16->Acknowledge");
+ ui.ResetInterlock->setTargets("kst/modmodtiming_kst.01->Reset;k16/interlock/mod_k16.01->Acknowledge");
}
else if (!modNum.compare("16")) {
- // kst/interlock/mod_kst -> f/interlock/modk16
+ // kst/interlock/mod_kst -> k16/interlock/mod_k16.01
// cout << " K16 " << endl; exit(0);
ui.MDK_Label->setText("16");
ui.SF6Press->hide();
@@ -1324,7 +1324,7 @@ super::super(QWidget *parent) : QWidget(parent)
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.Timing_Led->setSource("k16/mod/modtiming/RfBeginEnab");
+ 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");
@@ -1333,7 +1333,7 @@ super::super(QWidget *parent) : QWidget(parent)
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_Interlock_Enable->setSource("f/interlock/modk16/StatCol3Blk2");
+ 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");
@@ -1357,39 +1357,38 @@ super::super(QWidget *parent) : QWidget(parent)
ui.Conditioning_State->setSource("k16/mod/modcond/State");
// Timing tab
- ui.ThyratronEnable->setSource("k16/mod/modtiming/ThyratronEnab");
- ui.Thyratron->setSource("k16/mod/modtiming/Thyratron");
- ui.ThyratronSet->setTargets("k16/mod/modtiming/Thyratron");
- ui.OfflineMode->setSource("f/timing/rttrigger_mod_kg16.01/EnableStaticTriggerShift");
- ui.OfflineMode->setTargets("f/timing/rttrigger_mod_kg16.01/EnableStaticTriggerShift");
+ ui.ThyratronEnable->setSource("k16/mod/modtiming_k16.01/ThyratronEnab");
+ ui.Thyratron->setSource("k16/mod/modtiming_k16.01/Thyratron");
+ ui.ThyratronSet->setTargets("k16/mod/modtiming_k16.01/Thyratron");
+ ui.OfflineMode->setSource("k16/timing/rttrigger_mod_k16.01/EnableStaticTriggerShift");
+ ui.OfflineMode->setTargets("k16/timing/rttrigger_mod_k16.01/EnableStaticTriggerShift");
ui.RfWidthEnable->setSource("k16/mod/llrf_k16.01/pulse_state");
ui.RfWidth->setSource("k16/mod/llrf_k16.01/RfLength");
ui.RfWidthSet->setTargets("k16/mod/llrf_k16.01/RfLength");
ui.RfEndEnable->setSource("k16/mod/llrf_k16.01/pulse_state");
ui.RfEnd->setSource("k16/mod/llrf_k16.01/RfEnd");
ui.RfEndSet->setTargets("k16/mod/llrf_k16.01/RfEnd");
- ui.ThyratronInterlock->setSource("k16/mod/modtiming/HvFault");
+ ui.ThyratronInterlock->setSource("k16/mod/modtiming_k16.01/HvFault");
ui.RfInterlock->setSource("k16/mod/llrf_k16.01/Interlock_state");
- ui.ResetInterlock->setTargets("k16/mod/llrf_k16.01->ResetInterlock;k16/mod/modtiming->Reset;f/interlock/mod05->Acknowledge");
+ ui.ResetInterlock->setTargets("k16/mod/llrf_k16.01->ResetInterlock;k16/mod/modtiming_k16.01->Reset;k16/interlock/mod_k16.01->Acknowledge");
ui.rfReverseAB_2->setNumColumns(2);
ui.rfReverseAB_2->setDisplayMask("2,3");
- ui.rfReverseAB_2->setSource("f/interlock/modk16/StatCol5Blk1");
- ui.ThyratronOn->setTargets("k16/mod/modtiming->ThyMeaOn");
- ui.ThyratronOff->setTargets("k16/mod/modtiming->ThyMeaOff");
+ 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.RfOn->setTargets("k16/mod/modtiming->RfOn;kst/interlock/mod_kst->Ackmod");
- ui.RfOn->setTargets("k16/mod/modtiming->RfOn");
+ 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");
ui.RfRevEnable->hide();
// Filaments tab
- ui.thyfil_enable->setSource("f/interlock/modk16/StatCol3Blk3");
+ ui.thyfil_enable->setSource("k16/interlock/mod_k16.01/StatCol3Blk3");
ui.thyfil_enable->setDisplayMask("0");
ui.thyfil_psk_stat->setSource("k16/power_supply/pst_k16/State");
- // ui.thyfil_psk_stat->setSource("f/interlock/modk16/StatCol3Blk3");
+ // ui.thyfil_psk_stat->setSource("k16/interlock/mod_k16.01/StatCol3Blk3");
// ui.thyfil_psk_stat->setDisplayMask("0");
ui.thyfil_vlt->setSource("k16/power_supply/pst_k16/Voltage");
ui.thyfil_cur->setSource("k16/power_supply/pst_k16/Current");
@@ -1398,13 +1397,13 @@ super::super(QWidget *parent) : QWidget(parent)
ui.thyfil_on->setTargets("k16/power_supply/pst_k16->On");
ui.thyfil_isOn->setSource("k16/power_supply/pst_k16/Is100");
ui.thyfil_reset->setTargets("k16/power_supply/pst_k16->Reset");
- ui.klyfil_enable->setSource("f/interlock/modk16/StatCol3Blk5");
+ ui.klyfil_enable->setSource("k16/interlock/mod_k16.01/StatCol3Blk5");
ui.klyfil_enable->setDisplayMask("0");
ui.klyfil_psk_stat->show();
ui.klyfil_psk_stat->hide();
- // ui.klyfil_psk_stat->setSource("f/interlock/modk16/StatCol3Blk5");
+ // ui.klyfil_psk_stat->setSource("k16/interlock/mod_k16.01/StatCol3Blk5");
// ui.klyfil_psk_stat->setDisplayMask("0");
- // timetogo f/interlock/modk16/StatCol3Blk4
+ // timetogo k16/interlock/mod_k16.01/StatCol3Blk4
ui.klyfil_vlt->setSource("k16/power_supply/psk_k16/Voltage");
ui.klyfil_cur->setSource("k16/power_supply/psk_k16/Current");
@@ -1415,7 +1414,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.klyfil_100->setTargets("k16/power_supply/psk_k16->On");
ui.klyfil_is100->setSource("k16/power_supply/psk_k16/Is100");
ui.klyfil_reset->setTargets("k16/power_supply/psk_k16->Reset");
- // timetogo f/interlock/modk16/StatCol3Blk6
+ // timetogo k16/interlock/mod_k16.01/StatCol3Blk6
// Pulse tab
ui.kly_vac_fault->setDisplayMask("2");
@@ -1425,23 +1424,23 @@ super::super(QWidget *parent) : QWidget(parent)
ui.premag_off->setTargets("k16/power_supply/premag_k16.01->Off");
ui.premag_on->setTargets("k16/power_supply/premag_k16.01->On");
ui.premag_stat->setSource("k16/power_supply/premag_k16.01/State");
- ui.kly_vac_fault->setSource("kst/interlock/mod_kst/StatThyTriggerEnable");
- ui.piri_a_fault->setSource("f/interlock/modk16/StatCol4Blk1");
- ui.piri_b_fault->setSource("f/interlock/modk16/StatCol4Blk1");
- ui.reset_premag->setTargets("f/interlock/ethcmdk16->PREMAG_RESTART");
+ ui.kly_vac_fault->setSource("kst/interlock/mod_kst.01/StatThyTriggerEnable"); // renaming
+ ui.piri_a_fault->setSource("k16/interlock/mod_k16.01/StatCol4Blk1");
+ ui.piri_b_fault->setSource("k16/interlock/mod_k16.01/StatCol4Blk1");
+ ui.reset_premag->setTargets("k16/interlock/ethcmd_k16.01->PREMAG_RESTART");
ui.reset_piri->setTargets("k16/mod/rfamp->ResetPiri");
ui.vacuumKly->setSource("k16/vacuum/sip08_k16.01/Current");
- ui.KlyCollTemp->setSource("f/interlock/fluxk16/KLYTemp");
+ ui.KlyCollTemp->setSource("k16/interlock/flux_k16.01/KLYTemp");
ui.peakI->unsetSource(); ui.peakI->setText(" ");
ui.revI->unsetSource(); ui.revI->setText(" ");
//ui.reset_pi->setTargets("k16/mod/klyfil->ResetIonicPump");
ui.reset_pi->setTargets("");
// SF6 tab
- ui.SF6Press->setSource("f/interlock/sf6_k16/SF6Press");
- ui.SF6Open->setTargets("f/interlock/sf6_k16->Open");
- ui.SF6Close->setTargets("f/interlock/sf6_k16->Close");
- ui.SF6Stat->setSource("f/interlock/sf6_k16/StatSF6");
+ ui.SF6Press->setSource("k16/interlock/sf6_k16.01/SF6Press");
+ ui.SF6Open->setTargets("k16/interlock/sf6_k16.01->Open");
+ ui.SF6Close->setTargets("k16/interlock/sf6_k16.01->Close");
+ ui.SF6Stat->setSource("k16/interlock/sf6_k16.01/StatSF6");
ui.SF6Press->show();
ui.SF6Open->show();
ui.SF6Close->show();
@@ -1458,7 +1457,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.rfamp_reset->setTargets("k16/mod/rfamp->ResetReversePower");
ui.rfReverseAB->setNumColumns(2);
ui.rfReverseAB->setDisplayMask("2,3");
- ui.rfReverseAB->setSource("f/interlock/modk16/StatCol5Blk1");
+ ui.rfReverseAB->setSource("k16/interlock/mod_k16.01/StatCol5Blk1");
ui.rfReverseAB->setTrueColors(ui.rfReverseAB_2->trueColors());
ui.foc_off->setTargets("k16/power_supply/psklyfoc_k16.01->Off;k16/power_supply/psklyfoc_k16.02->Off;k16/power_supply/psklyfoc_k16.03->Off");
ui.foc_on->setTargets("k16/power_supply/psklyfoc_k16.01->On;k16/power_supply/psklyfoc_k16.02->On;k16/power_supply/psklyfoc_k16.03->On");
@@ -1468,10 +1467,10 @@ super::super(QWidget *parent) : QWidget(parent)
ui.foc_stat_1_label->setText("1");
ui.foc_stat_2_label->setText("2");
ui.foc_stat_3_label->setText("3");
- ui.reset_k4->setTargets("f/interlock/fock16->DeltaAlarmRestart");
- ui.fug_begin->setSource("k16/mod/modtiming/FugBegin");
- ui.fug_width->setSource("k16/mod/modtiming/FugWidth");
- ui.fug_polarity->setSource("k16/mod/modtiming/FugPolarity");
+ ui.reset_k4->setTargets("k16/interlock/foc_k16.01->DeltaAlarmRestart");
+ ui.fug_begin->setSource("k16/mod/modtiming_k16.01/FugBegin");
+ ui.fug_width->setSource("k16/mod/modtiming_k16.01/FugWidth");
+ ui.fug_polarity->setSource("k16/mod/modtiming_k16.01/FugPolarity");
ui.RnmMode->setSource("k16/mod/llrf_k16.01/RnmMode");
ui.RnmMode->setTargets("k16/mod/llrf_k16.01/RnmMode");
ui.tertiaryLabel->show();
@@ -1484,14 +1483,14 @@ super::super(QWidget *parent) : QWidget(parent)
connectDevice("k16/mod/hv", &hvServer);
if (condServer) {delete condServer; condServer = 0;}
connectDevice("k16/mod/modcond", &condServer);
- ui.ResetInterlock->setTargets("k16/mod/modtiming->Reset;f/interlock/modk16->Acknowledge");
+ ui.ResetInterlock->setTargets("k16/mod/modtiming->Reset;k16/interlock/mod_k16.01->Acknowledge");
}
else if (!modNum.compare("sp")) {
ui.MDK_Label->setText("S");
- ui.SF6Press->setSource("f/interlock/sf6_00/SF6Press");
- ui.SF6Open->setTargets("f/interlock/sf6_00->Open");
- ui.SF6Close->setTargets("f/interlock/sf6_00->Close");
- ui.SF6Stat->setSource("f/interlock/sf6_00/StatSF6");
+ ui.SF6Press->setSource("ks/interlock/sf6_ks.01/SF6Press");
+ ui.SF6Open->setTargets("ks/interlock/sf6_ks.01->Open");
+ ui.SF6Close->setTargets("ks/interlock/sf6_ks.01->Close");
+ ui.SF6Stat->setSource("ks/interlock/sf6_ks.01/StatSF6");
ui.SF6Press->show();
ui.SF6Open->show();
ui.SF6Close->show();
@@ -1543,7 +1542,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");
- ui.Ross_Interlock_Enable->setSource("f/interlock/mod"+modNum+"/StatHvEnable");
+ ui.Ross_Interlock_Enable->setSource("k"+modNum+"/interlock/mod_k"+modNum+".01/StatHvEnable");
ui.Ross_Interlock_Enable->setDisplayMask(QList<unsigned>() << 5);
ui.Ross_Acs_Enable->setDisplayMask(QList<unsigned>() << modNum.toUInt());
ui.HV_ON->setTargets("k"+modNum+"/mod/ross_k"+modNum+".01->On;k"+modNum+"/mod/hv_k"+modNum+".01->ON");
@@ -1570,8 +1569,8 @@ super::super(QWidget *parent) : QWidget(parent)
ui.ThyratronEnable->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/ThyratronEnab");
ui.Thyratron->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/Thyratron");
ui.ThyratronSet->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01/Thyratron");
- ui.OfflineMode->setSource("f/timing/rttrigger_mod_kg"+modNum+".01/EnableStaticTriggerShift");
- ui.OfflineMode->setTargets("f/timing/rttrigger_mod_kg"+modNum+".01/EnableStaticTriggerShift");
+ ui.OfflineMode->setSource("k"+modNum+"/timing/rttrigger_mod_k"+modNum+".01/EnableStaticTriggerShift");
+ ui.OfflineMode->setTargets("k"+modNum+"/timing/rttrigger_mod_k"+modNum+".01/EnableStaticTriggerShift");
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");
@@ -1580,25 +1579,25 @@ super::super(QWidget *parent) : QWidget(parent)
ui.RfEndSet->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01/RfEnd");
ui.ThyratronInterlock->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/HvFault");
ui.RfInterlock->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/Interlock_state");
- ui.ResetInterlock->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01->ResetInterlock;k"+modNum+"/mod/modtiming_k"+modNum+".01->Reset;f/interlock/mod"+modNum+"->Acknowledge");
+ ui.ResetInterlock->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01->ResetInterlock;k"+modNum+"/mod/modtiming_k"+modNum+".01->Reset;k"+modNum+"/interlock/mod_k"+modNum+".01->Acknowledge");
ui.rfReverseAB_2->setNumColumns(2);
ui.rfReverseAB_2->setDisplayMask("2,3");
- ui.rfReverseAB_2->setSource("f/interlock/mod"+modNum+"/StatRfTrigger");
+ ui.rfReverseAB_2->setSource("k"+modNum+"/interlock/mod_k"+modNum+".01/StatRfTrigger");
ui.ThyratronOn->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->ThyMeaOn");
ui.ThyratronOff->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->ThyMeaOff");
ui.Rfamp_Led_2->setSource("k"+modNum+"/mod/rfamp_k"+modNum+".01/IsOn");
ui.rfamp_reset_2->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->ResetReversePower");
ui.RfOff->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->RfOff");
- ui.RfOn->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->RfOn;f/interlock/mod"+modNum+"->Ackmod");
+ ui.RfOn->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->RfOn;k"+modNum+"/interlock/mod_k"+modNum+".01->Ackmod");
// Filaments tab
- ui.thyfil_enable->setSource("f/interlock/mod"+modNum+"/StatHvEnable");
+ ui.thyfil_enable->setSource("k"+modNum+"/interlock/mod_k"+modNum+".01/StatHvEnable");
ui.thyfil_enable->setDisplayMask("7");
- ui.thyfil_psk_stat->setSource("f/interlock/mod"+modNum+"/StatHvEnable");
+ ui.thyfil_psk_stat->setSource("k"+modNum+"/interlock/mod_k"+modNum+".01/StatHvEnable");
ui.thyfil_psk_stat->setDisplayMask("6");
- ui.klyfil_enable->setSource("f/interlock/mod"+modNum+"/StatHvEnable");
+ ui.klyfil_enable->setSource("k"+modNum+"/interlock/mod_k"+modNum+".01/StatHvEnable");
ui.klyfil_enable->setDisplayMask("9");
- ui.klyfil_psk_stat->setSource("f/interlock/mod"+modNum+"/StatHvEnable");
+ ui.klyfil_psk_stat->setSource("k"+modNum+"/interlock/mod_k"+modNum+".01/StatHvEnable");
// ui.klyfil_psk_stat->setDisplayMask("8");
ui.thyfil_vlt->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/Voltage");
ui.thyfil_cur->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/Current");
@@ -1637,9 +1636,9 @@ super::super(QWidget *parent) : QWidget(parent)
ui.premag_off->setTargets("k"+modNum+"/mod/premag_k"+modNum+".01->Off");
ui.premag_on->setTargets("k"+modNum+"/mod/premag_k"+modNum+".01->On");
ui.premag_stat->setSource("k"+modNum+"/mod/premag_k"+modNum+".01/State");
- ui.kly_vac_fault->setSource("f/interlock/mod"+modNum+"/StatThyTriggerEnable");
- ui.piri_a_fault->setSource("f/interlock/mod"+modNum+"/StatThyTriggerEnable");
- ui.piri_b_fault->setSource("f/interlock/mod"+modNum+"/StatThyTriggerEnable");
+ ui.kly_vac_fault->setSource("k"+modNum+"/interlock/mod_k"+modNum+".01/StatThyTriggerEnable");
+ ui.piri_a_fault->setSource("k"+modNum+"/interlock/mod_k"+modNum+".01/StatThyTriggerEnable");
+ ui.piri_b_fault->setSource("k"+modNum+"/interlock/mod_k"+modNum+".01/StatThyTriggerEnable");
ui.reset_piri->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->ResetPiri");
ui.vacuumKly->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/KlystronPressure");
ui.vacuumKlyInt->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/KlystronPressureIntegrated");
@@ -1649,10 +1648,10 @@ super::super(QWidget *parent) : QWidget(parent)
ui.reset_pi->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->ResetIonicPump");
// SF6 tab
- ui.SF6Press->setSource("f/interlock/sf6_"+modNum+"/SF6Press");
- ui.SF6Open->setTargets("f/interlock/sf6_"+modNum+"->Open");
- ui.SF6Close->setTargets("f/interlock/sf6_"+modNum+"->Close");
- ui.SF6Stat->setSource("f/interlock/sf6_"+modNum+"/StatSF6");
+ ui.SF6Press->setSource("k"+modNum+"/interlock/sf6_"+modNum+".01/SF6Press");
+ ui.SF6Open->setTargets("k"+modNum+"/interlock/sf6_"+modNum+".01->Open");
+ ui.SF6Close->setTargets("k"+modNum+"/interlock/sf6_"+modNum+".01->Close");
+ ui.SF6Stat->setSource("k"+modNum+"/interlock/sf6_"+modNum+".01/StatSF6");
ui.frame_sf6->show();
ui.SF6Press->show();
ui.SF6Open->show();
@@ -1670,7 +1669,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.rfReverseAB->setNumColumns(modNum.toInt()==4? 1: 2);
// ui.rfReverseAB->setDisplayMask(modNum.toInt()<3? "4,5": (modNum.toInt()==4? "12": "4,5"));
ui.rfReverseAB->setDisplayMask(modNum.toInt()<3? "3,4": (modNum.toInt()==4? "12": "2,3"));
- ui.rfReverseAB->setSource("f/interlock/mod"+modNum+"/StatRfTrigger");
+ ui.rfReverseAB->setSource("k"+modNum+"/interlock/mod_k"+modNum+".01/StatRfTrigger");
ui.rfReverseAB->setTrueColors(ui.rfReverseAB_2->trueColors());
ui.foc_stat_1->setSource("k"+modNum+"/power_supply/psklyfoc_k"+modNum+".01/State");
ui.foc_stat_2->setSource("k"+modNum+"/power_supply/psklyfoc_k"+modNum+".02/State");
@@ -1680,7 +1679,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.foc_stat_1_label->setText("1");
ui.foc_stat_2_label->setText("2");
ui.foc_stat_3_label->setText("3");
- ui.reset_k4->setTargets("f/interlock/foc"+modNum+"->DeltaAlarmRestart");
+ ui.reset_k4->setTargets("k"+modNum+"/interlock/foc_k"+modNum+".01->DeltaAlarmRestart");
ui.fug_begin->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/FugBegin");
ui.fug_width->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/FugWidth");
ui.fug_polarity->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/FugPolarity");
@@ -1698,10 +1697,10 @@ super::super(QWidget *parent) : QWidget(parent)
connectDevice("k"+modNum+"/mod/modcond_k"+modNum+".01", &condServer);
}
else {
- ui.SF6Press->setSource("f/interlock/sf6_"+modNum+"/SF6Press");
- ui.SF6Open->setTargets("f/interlock/sf6_"+modNum+"->Open");
- ui.SF6Close->setTargets("f/interlock/sf6_"+modNum+"->Close");
- ui.SF6Stat->setSource("f/interlock/sf6_"+modNum+"/StatSF6");
+ ui.SF6Press->setSource("k"+modNum+"/interlock/sf6_"+modNum+".01/SF6Press");
+ ui.SF6Open->setTargets("k"+modNum+"/interlock/sf6_"+modNum+".01->Open");
+ ui.SF6Close->setTargets("k"+modNum+"/interlock/sf6_"+modNum+".01->Close");
+ ui.SF6Stat->setSource("k"+modNum+"/interlock/sf6_"+modNum+".01/StatSF6");
ui.SF6Press->show();
ui.SF6Open->show();
ui.SF6Close->show();
@@ -1740,7 +1739,7 @@ super::super(QWidget *parent) : QWidget(parent)
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("f/interlock/abimod"+modNum+"/StatAbiTriggerRf");
+ // ui.Interlock_Led->setSource("k"+modNum+"/interlock/abimod_k"+modNum+".01/StatAbiTriggerRf");
ui.Interlock_Led->setSource("k"+modNum+"/mod/general_k"+modNum+".01/Interlock");
ui.Timing_Led->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/RfBeginEnab");
ui.Rfamp_Led->setSource("k"+modNum+"/mod/rfamp_k"+modNum+".01/IsOn");
@@ -1755,10 +1754,10 @@ super::super(QWidget *parent) : QWidget(parent)
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")) {
- ui.Ross_Interlock_Enable->setSource("f/interlock/mod00/StatHvEnable");
+ ui.Ross_Interlock_Enable->setSource("ks/interlock/mod_ks.01/StatHvEnable");
}
else {
- ui.Ross_Interlock_Enable->setSource("f/interlock/mod"+modNum+"/StatHvEnable");
+ ui.Ross_Interlock_Enable->setSource("k"+modNum+"/interlock/mod_k"+modNum+".01/StatHvEnable");
}
if (modNum.compare("04")) ui.Ross_Interlock_Enable->setDisplayMask(QList<unsigned>() << 5);
@@ -1775,7 +1774,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.current_Scalar->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/Current");
ui.currentSet_Scalar->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/CurrentSet");
ui.setCur_ApplyNumeric->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01/CurrentSet");
- // ui.RampUp_PushButton_2->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01->RampUp;f/interlock/mod"+modNum+"->Acknowledge");
+ // ui.RampUp_PushButton_2->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01->RampUp;k"+modNum+"/interlock/mod_k"+modNum+".01->Acknowledge");
// ui.RampUp_PushButton_2->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01->RampUp");
ui.RampUp_PushButton_2->setTargets("k"+modNum+"/mod/modcond_k"+modNum+".01->On");
ui.rampStat->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/RampStat");
@@ -1784,7 +1783,7 @@ super::super(QWidget *parent) : QWidget(parent)
// Ramp tab
ui.default_ramp->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/getDefaultRamp");
- // ui.ButtonFullPower_2->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01->RampUp;f/interlock/mod"+modNum+"->Acknowledge");
+ // ui.ButtonFullPower_2->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01->RampUp;k"+modNum+"/interlock/mod_k"+modNum+".01->Acknowledge");
// ui.ButtonFullPower_2->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01->RampUp");
ui.ButtonFullPower_2->setTargets("k"+modNum+"/mod/modcond_k"+modNum+".01->On"); // 27-04-2011
ui.rampDown_ApplyNumeric->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01->RampDown");
@@ -1800,19 +1799,13 @@ super::super(QWidget *parent) : QWidget(parent)
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")) {
- ui.OfflineMode->setSource("f/timing/rttrigger_mod_kg00.01/EnableStaticTriggerShift");
- ui.OfflineMode->setTargets("f/timing/rttrigger_mod_kg00.01/EnableStaticTriggerShift");
+ ui.OfflineMode->setSource("ks/timing/rttrigger_mod_ks.01/EnableStaticTriggerShift");
+ ui.OfflineMode->setTargets("ks/timing/rttrigger_mod_ks.01/EnableStaticTriggerShift");
}
else {
- ui.OfflineMode->setSource("f/timing/rttrigger_mod_kg"+modNum+".01/EnableStaticTriggerShift");
- ui.OfflineMode->setTargets("f/timing/rttrigger_mod_kg"+modNum+".01/EnableStaticTriggerShift");
+ ui.OfflineMode->setSource("k"+modNum+"/timing/rttrigger_mod_k"+modNum+".01/EnableStaticTriggerShift");
+ ui.OfflineMode->setTargets("k"+modNum+"/timing/rttrigger_mod_k"+modNum+".01/EnableStaticTriggerShift");
}
- // ui.RfWidthEnable->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/RfBeginEnab");
- // ui.RfWidth->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/RfWidth");
- // ui.RfWidthSet->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01/RfWidth");
- // ui.RfBeginEnable->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/RfBeginEnab");
- // ui.RfBegin->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/RfWidth");
- // ui.RfBeginSet->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01/RfWidth");
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")) {
ui.RfRevEnable->show();
@@ -1834,104 +1827,82 @@ super::super(QWidget *parent) : QWidget(parent)
ui.RfEndEnable->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/pulse_state");
ui.RfEnd->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/RfEnd");
ui.RfEndSet->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01/RfEnd");
- // ui.RfEndEnable->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/RfEndEnab");
- // ui.RfEnd->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/RfEndwithWidth");
- // ui.RfEndSet->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01/RfEndwithWidth");
ui.ThyratronInterlock->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/HvFault");
ui.RfInterlock->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/Interlock_state");
if (!modNum.compare("04")) {
- ui.ResetInterlock->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->Reset;f/interlock/mod"+modNum+"->Acknowledge");
- ui.rfReverseAB_2->setSource("f/interlock/mod04/StatThyTriggerEnable");
+ 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")) {
- ui.ResetInterlock->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01->ResetInterlock;k"+modNum+"/mod/modtiming_k"+modNum+".01->Reset;f/interlock/mod00->Acknowledge");
- ui.rfReverseAB_2->setSource("f/interlock/mod00/StatRfTrigger");
+ 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");
}
else {
- ui.ResetInterlock->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01->ResetInterlock;k"+modNum+"/mod/modtiming_k"+modNum+".01->Reset;f/interlock/mod"+modNum+"->Acknowledge");
- ui.rfReverseAB_2->setSource("f/interlock/mod"+modNum+"/StatRfTrigger");
+ ui.ResetInterlock->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01->ResetInterlock;k"+modNum+"/mod/modtiming_k"+modNum+".01->Reset;k"+modNum+"/interlock/mod_k"+modNum+".01->Acknowledge");
+ ui.rfReverseAB_2->setSource("k"+modNum+"/interlock/mod_k"+modNum+".01/StatRfTrigger");
}
- // ui.ThyratronOn->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->ThyMeaOn;f/interlock/mod"+modNum+"->Acknowledge");
ui.ThyratronOn->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->ThyMeaOn");
ui.ThyratronOff->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->ThyMeaOff");
ui.Rfamp_Led_2->setSource("k"+modNum+"/mod/rfamp_k"+modNum+".01/IsOn");
ui.rfReverseAB_2->setNumColumns(modNum.toInt()==4? 1: 2);
- // ui.rfReverseAB_2->setDisplayMask(modNum.toInt()<3? "4,5": (modNum.toInt()==4? "12": "4,5"));
ui.rfReverseAB_2->setDisplayMask(modNum.toInt()<3? "3,4": (modNum.toInt()==4? "12": "2,3"));
- // ui.rfReverseAB_2->setSource("f/interlock/mod"+modNum+(modNum.toInt()==4? "/StatThyTriggerEnable": "/StatRfTrigger"));
ui.rfReverseAB_2->setTrueColors(ui.rfReverseAB_2->trueColors());
ui.rfamp_reset_2->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->ResetReversePower");
- // ui.RfOn->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01/pulse_enable(true);f/interlock/mod"+modNum+"->Ackmod");
- // ui.RfOff->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01/pulse_enable(false)");
- // ui.RfOn->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->RfOn;f/interlock/mod"+modNum+"->Ackmod");
ui.RfOff->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->RfOff");
sleep(0.2);
// Filaments tab
if (!modNum.compare("sp")) {
- ui.RfOn->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->RfOn;f/interlock/mod00->Ackmod");
- ui.thyfil_enable->setSource("f/interlock/mod00/StatHvEnable");
+ 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");
- ui.thyfil_psk_stat->setSource("f/interlock/mod00/StatHvEnable");
- ui.klyfil_enable->setSource("f/interlock/mod00/StatHvEnable");
+ ui.thyfil_psk_stat->setSource("ks/interlock/mod_ks.01/StatHvEnable");
+ ui.klyfil_enable->setSource("ks/interlock/mod_ks.01/StatHvEnable");
ui.klyfil_enable->setDisplayMask("9");
- ui.klyfil_psk_stat->setSource("f/interlock/mod00/StatHvEnable");
+ 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->Ackmod");
- ui.thyfil_enable->setSource("kst/interlock/mod_kst/StatHvEnable");
+ ui.RfOn->setTargets("kst/modmodtiming_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/StatHvEnable");
- ui.klyfil_enable->setSource("kst/interlock/mod_kst/StatHvEnable");
+ ui.thyfil_psk_stat->setSource("kst/interlock/mod_kst.01/StatHvEnable");
+ ui.klyfil_enable->setSource("kst/interlock/mod_kst.01/StatHvEnable");
ui.klyfil_enable->setDisplayMask("9");
- ui.klyfil_psk_stat->setSource("kst/interlock/mod_kst/StatHvEnable");
+ 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.thyfil_enable->setSource("kst/interlock/mod_kst/StatHvEnable");
+ ui.thyfil_enable->setSource("kst/interlock/mod_kst.01/StatHvEnable");
ui.thyfil_enable->setDisplayMask("7");
- // ui.thyfil_psk_stat->setSource("kst/interlock/mod_kst/StatHvEnable");
- ui.klyfil_enable->setSource("kst/interlock/mod_kst/StatHvEnable");
+ ui.klyfil_enable->setSource("kst/interlock/mod_kst.01/StatHvEnable");
ui.klyfil_enable->setDisplayMask("9");
- // ui.klyfil_psk_stat->setSource("kst/interlock/mod_kst/StatHvEnable");
}
else {
- ui.RfOn->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->RfOn;f/interlock/mod"+modNum+"->Ackmod");
- ui.thyfil_enable->setSource("f/interlock/mod"+modNum+"/StatHvEnable");
+ ui.RfOn->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->RfOn;k"+modNum+"/interlock/mod_k"+modNum+".01->Ackmod");
+ ui.thyfil_enable->setSource("k"+modNum+"/interlock/mod_k"+modNum+".01/StatHvEnable");
ui.thyfil_enable->setDisplayMask("7");
- ui.thyfil_psk_stat->setSource("f/interlock/mod"+modNum+"/StatHvEnable");
- ui.klyfil_enable->setSource("f/interlock/mod"+modNum+"/StatHvEnable");
+ ui.thyfil_psk_stat->setSource("k"+modNum+"/interlock/mod_k"+modNum+".01/StatHvEnable");
+ ui.klyfil_enable->setSource("k"+modNum+"/interlock/mod_k"+modNum+".01/StatHvEnable");
ui.klyfil_enable->setDisplayMask("9");
- ui.klyfil_psk_stat->setSource("f/interlock/mod"+modNum+"/StatHvEnable");
+ ui.klyfil_psk_stat->setSource("k"+modNum+"/interlock/mod_k"+modNum+".01/StatHvEnable");
}
ui.thyfil_vlt->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/Voltage");
ui.thyfil_cur->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/Current");
- // ui.thyfil_vlt_fault->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/VoltageFault");
- // ui.thyfil_cur_fault->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/CurrentFault");
ui.thyfil_off->setTargets("k"+modNum+"/mod/thyfil_k"+modNum+".01->Off");
ui.thyfil_isOff->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/IsOff");
- // ui.thyfil_on->setTargets("k"+modNum+"/mod/thyfil_k"+modNum+".01->On;f/interlock/mod"+modNum+"->Acknowledge");
ui.thyfil_on->setTargets("k"+modNum+"/mod/thyfil_k"+modNum+".01->On");
ui.thyfil_isOn->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/IsOn");
- // ui.thyfil_termoswitch->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/IsTermoswitch");
- // ui.thyfil_wait->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/IsWaiting");
- // ui.thyfil_psk->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/IsPsk");
ui.thyfil_reset->setTargets("k"+modNum+"/mod/thyfil_k"+modNum+".01->Reset");
- // ui.thyfil_fault->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/IsFault");
ui.klyfil_vlt->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/Voltage");
ui.klyfil_cur->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/Current");
- // ui.klyfil_vlt_fault->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/VoltageFault");
- // ui.klyfil_cur_fault->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/CurrentFault");
ui.klyfil_off->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->Off");
ui.klyfil_isOff->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/IsOff");
- // ui.klyfil_80->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->Standby;f/interlock/mod"+modNum+"->Acknowledge");
ui.klyfil_80->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->Standby");
ui.klyfil_is80->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/Is80");
- // ui.klyfil_100->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->On;f/interlock/mod"+modNum+"->Acknowledge");
ui.klyfil_100->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->On");
ui.klyfil_is100->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/Is100");
ui.klyfil_reset->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->Reset");
@@ -1957,7 +1928,6 @@ super::super(QWidget *parent) : QWidget(parent)
ui.repetition_rate->setSource("k"+modNum+"/mod/modfreq_k"+modNum+".01/Frequency");
ui.premag_cur->setSource("k"+modNum+"/mod/premag_k"+modNum+".01/Current");
ui.premag_off->setTargets("k"+modNum+"/mod/premag_k"+modNum+".01->Off");
- // ui.premag_on->setTargets("k"+modNum+"/mod/premag_k"+modNum+".01->On;f/interlock/mod"+modNum+"->Acknowledge");
ui.premag_on->setTargets("k"+modNum+"/mod/premag_k"+modNum+".01->On");
ui.premag_stat->setSource("k"+modNum+"/mod/premag_k"+modNum+".01/State");
if (!modNum.compare("04") && !K4RfAmp.compare("k04/mod/twtrfamp_k04.01")) {
@@ -1968,32 +1938,23 @@ super::super(QWidget *parent) : QWidget(parent)
ui.rfamp_stat->setSource("ks/mod/rfamp_ks.01/IsOn");
}
else {
- // ui.rfamp_on->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->On;f/interlock/mod"+modNum+"->Acknowledge");
- // ui.rfamp_off->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->Off");
ui.rfamp_stat->setSource("k"+modNum+"/mod/rfamp_k"+modNum+".01/IsOn");
}
}
- // ui.rfamp_stat->setDisplayMask(QList<unsigned>() << modNum.toUInt());
- // ui.rfamp_stat->setTrueColors(ui.rfamp_stat->trueColors());
- // ui.rfamp_enable->setDisplayMask(QList<unsigned>() << modNum.toUInt());
- // ui.rfamp_enable->setDisplayMask(QList<unsigned>() << (2 << modNum.toUInt()));
ui.rfamp_enable->setDisplayMask(!modNum.compare("sp")? "0": (modNum.toUInt()==1? "1": (modNum.toUInt()==2? "2": "3")));
- // ui.rfamp_enable->setSource("f/access_control/safety/Linac_mod_abi_rf");
- // cout << "******* setDisplayMask(" << (!modNum.compare("sp")? "0": (modNum.toUInt()==1? "1": (modNum.toUInt()==2? "2": "3"))) << ")" << endl;
ui.rfReverseAB->setNumColumns(modNum.toInt()==4? 1: 2);
- // ui.rfReverseAB->setDisplayMask(modNum.toInt()<3? "4,5": (modNum.toInt()==4? "12": "4,5"));
ui.rfReverseAB->setDisplayMask(modNum.toInt()<3? "3,4": (modNum.toInt()==4? "12": "2,3"));
if (!modNum.compare("04")) {
- ui.rfReverseAB->setSource("f/interlock/mod04/StatThyTriggerEnable");
+ 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")) {
- ui.rfReverseAB->setSource("f/interlock/mod00/StatRfTrigger");
- ui.reset_k4->setTargets("f/interlock/foc00->DeltaAlarmRestart");
+ ui.rfReverseAB->setSource("ks/interlock/mod_ks.01/StatRfTrigger");
+ ui.reset_k4->setTargets("ks/interlock/foc_ks.01->DeltaAlarmRestart");
}
else {
- ui.rfReverseAB->setSource("f/interlock/mod"+modNum+"/StatRfTrigger");
- ui.reset_k4->setTargets("f/interlock/foc"+modNum+"->DeltaAlarmRestart");
+ ui.rfReverseAB->setSource("k"+modNum+"/interlock/mod_k"+modNum+".01/StatRfTrigger");
+ ui.reset_k4->setTargets("k"+modNum+"/interlock/foc_k"+modNum+".01->DeltaAlarmRestart");
}
ui.rfReverseAB->setTrueColors(ui.rfReverseAB_2->trueColors());
if (!modNum.compare("04")) {
@@ -2020,15 +1981,15 @@ super::super(QWidget *parent) : QWidget(parent)
ui.reset_pi->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->ResetIonicPump");
if (!modNum.compare("sp")) {
- ui.kly_vac_fault->setSource("f/interlock/mod00/StatThyTriggerEnable");
- ui.piri_a_fault->setSource("f/interlock/mod00/StatThyTriggerEnable");
- ui.piri_b_fault->setSource("f/interlock/mod00/StatThyTriggerEnable");
+ 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");
ui.wg_com->show();
}
else {
- ui.kly_vac_fault->setSource("f/interlock/mod"+modNum+"/StatThyTriggerEnable");
- ui.piri_a_fault->setSource("f/interlock/mod"+modNum+"/StatThyTriggerEnable");
- ui.piri_b_fault->setSource("f/interlock/mod"+modNum+"/StatThyTriggerEnable");
+ ui.kly_vac_fault->setSource("k"+modNum+"/interlock/mod_k"+modNum+".01/StatThyTriggerEnable");
+ ui.piri_a_fault->setSource("k"+modNum+"/interlock/mod_k"+modNum+".01/StatThyTriggerEnable");
+ ui.piri_b_fault->setSource("k"+modNum+"/interlock/mod_k"+modNum+".01/StatThyTriggerEnable");
ui.wg_com->hide();
}
ui.reset_piri->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->ResetPiri");
@@ -2151,8 +2112,7 @@ super::super(QWidget *parent) : QWidget(parent)
}
// if (!modNum.compare("04")) {
if (!modNum.compare("04") && !K4RfAmp.compare("k04/mod/twtrfamp_k04.01")) {
- // cout << "cmd_rfamp_on->setTargets(k04/mod/twtrfamp_k04.01->On;f/interlock/mod04->Acknowledge)" << endl;
- cmd_rfamp_on->setTargets("k04/mod/twtrfamp_k04.01->On;f/interlock/mod04->Acknowledge");
+ cmd_rfamp_on->setTargets("k04/mod/twtrfamp_k04.01->On;l04/interlock/mod_k04->Acknowledge");
}
else if (!modNum.compare("05")) {
cmd_rfamp_on->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->On");
@@ -2476,13 +2436,6 @@ super::super(QWidget *parent) : QWidget(parent)
}
if (!modNum.compare("sp")) {
- /*
- condvacuum1_process->start("vacuumcond inj/vacuum/sip75_inj.01/Pressure inj/vacuum/sip75_inj.02/Pressure kg01/vacuum/psnip_kg01.01/Pressure GUN KS");
- condvacuum2_process->start("vacuumcond bc01/vacuum/sip55_bc01.02/Pressure bc01/vacuum/sip75_bc01.01/Pressure bc01/vacuum/sip75_bc01.02/Pressure LERFD-1 KS");
- condvacuum3_process->start("vacuumcond bc01/vacuum/sip75_bc01.03/Pressure bc01/vacuum/sip75_bc01.04/Pressure bc01/vacuum/sip75_bc01.05/Pressure bc01/vacuum/sip75_bc01.06/Pressure LERFD-2 KS");
- condvacuum4_process->start("vacuumcond ctf/vacuum/sip_ctf.01/Pressure ctf/vacuum/sip_ctf.02/Pressure ctf/vacuum/sip_ctf.03/Pressure ctf/vacuum/sip_ctf.04/Pressure ctf/vacuum/sip_ctf.05/Pressure ctf/vacuum/sip_ctf.06/Pressure CTF KS");
- */
- // condvacuum1_process->start("vacuumcond ctf/vacuum/sip_ctf.01/Pressure ctf/vacuum/sip_ctf.07/Pressure ctf/vacuum/sip_ctf.08/Pressure KGpump_LTloads_LTboc KS");
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");
}
diff --git a/src/super.ui b/src/super.ui
index f5bb9b1068127cb10f65c4c388ade6a79bde51b3..a1ce830abfcf2d9619214dc5f2bd8331a4a66391 100755
--- a/src/super.ui
+++ b/src/super.ui
@@ -6464,7 +6464,7 @@ p, li { white-space: pre-wrap; }
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="source">
- <string>f/interlock/modk16/StatCol3Blk4</string>
+ <string>k16/interlock/mod_k16.01/StatCol3Blk4</string>
</property>
<property name="forceNoUnit" stdset="0">
<bool>true</bool>
@@ -7190,7 +7190,7 @@ p, li { white-space: pre-wrap; }
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="source">
- <string>f/interlock/modk16/StatCol3Blk6</string>
+ <string>k16/interlock/mod_k16.01/StatCol3Blk6</string>
</property>
<property name="forceNoUnit" stdset="0">
<bool>true</bool>
@@ -8099,7 +8099,7 @@ p, li { white-space: pre-wrap; }
<string>4,5,6,7</string>
</property>
<property name="source">
- <string>f/interlock/modk16/StatCol4Blk1</string>
+ <string>k16/interlock/mod_k16.01/StatCol4Blk1</string>
</property>
</widget>
<widget class="QPushButton" name="open_scope">
@@ -8645,7 +8645,7 @@ p, li { white-space: pre-wrap; }
<string>2</string>
</property>
<property name="source">
- <string>f/interlock/mod01/StatRfTrigger</string>
+ <string>k01/interlock/mod_k01.01/StatRfTrigger</string>
</property>
</widget>
</widget>