Commit 5ee983a1 authored by Cristina Cocho's avatar Cristina Cocho

Added DiffDet detector in Doppler TOF settings

parent 0f198b62
......@@ -88,6 +88,10 @@ IN16bDopplerSetting::IN16bDopplerSetting(const string& name) :
SD_t1Delay.init(this, SAVE, "SD_actual_t1_delay", "SD_wanted_t1_delay", "SD T1");
PSD_t2TofValidation.init(this, SAVE, "PSD_actual_t2_tofvalidation", "PSD_wanted_t2_tofvalidation", "PSD T2");
PSD_t1Delay.init(this, SAVE, "PSD_actual_t1_delay", "PSD_wanted_t1_delay", "PSD T1");
DIFFDET_t2TofValidation.init(this, SAVE | SPY, "actual_DIFFDET_t2_tofvalidation", "wanted_DIFFDET_t2_tofvalidation", "DiffDetT2");
DIFFDET_t2TofValidation.setUnit("~mus");
DIFFDET_t1Delay.init(this, SAVE | SPY, "actual_DIFFDET_t1_delay", "wanted_DIFFDET_t1_delay", "DiffDetT1");
DIFFDET_t1Delay.setUnit("~mus");
nbChannels.init(this, SAVE, "wanted_nchannels");
nbDeadChannels.init(this, SAVE, "wanted_dead_nchannels");
......@@ -377,9 +381,14 @@ void IN16bDopplerSetting::start() {
} else if (i == 1) {
m_AcqControllers[i]->wantedT1Delay = SD_t1Delay.setpoint();
m_AcqControllers[i]->wantedT2TofValidation = SD_t2TofValidation.setpoint();
} else {
} else if (i == 2) {
m_AcqControllers[i]->wantedT1Delay = PSD_t1Delay.setpoint();
m_AcqControllers[i]->wantedT2TofValidation = PSD_t2TofValidation.setpoint();
} else if (i == 3) {
m_AcqControllers[i]->wantedT1Delay = DIFFDET_t1Delay.setpoint();
m_AcqControllers[i]->wantedT2TofValidation = DIFFDET_t2TofValidation.setpoint();
} else {
// error
}
m_AcqControllers[i]->nbChannels = nbChannels();
m_AcqControllers[i]->nbDeadChannels = nbDeadChannels();
......@@ -500,9 +509,14 @@ void IN16bDopplerSetting::start() {
} else if (i == 1) {
m_AcqControllers[i]->wantedT1Delay = SD_t1Delay.setpoint();
m_AcqControllers[i]->wantedT2TofValidation = SD_t2TofValidation.setpoint();
} else {
} else if (i == 2) {
m_AcqControllers[i]->wantedT1Delay = PSD_t1Delay.setpoint();
m_AcqControllers[i]->wantedT2TofValidation = PSD_t2TofValidation.setpoint();
} else if (i == 3) {
m_AcqControllers[i]->wantedT1Delay = DIFFDET_t1Delay.setpoint();
m_AcqControllers[i]->wantedT2TofValidation = DIFFDET_t2TofValidation.setpoint();
} else {
// error
}
m_AcqControllers[i]->nbChannels = nbChannels();
m_AcqControllers[i]->nbDeadChannels = nbDeadChannels();
......
......@@ -101,6 +101,8 @@ public:
Property<float64, SETPOINT> SD_t1Delay;
Property<float64, SETPOINT> PSD_t2TofValidation;
Property<float64, SETPOINT> PSD_t1Delay;
Property<float64, SETPOINT> DIFFDET_t2TofValidation;
Property<float64, SETPOINT> DIFFDET_t1Delay;
Property<int32> nbChannels;
Property<int32> nbDeadChannels;
......
......@@ -44,6 +44,10 @@ IN16bDopplerTOFSettings::IN16bDopplerTOFSettings(const string& controllerName) :
PSD_t2TofValidation.setUnit("~mus");
PSD_t1Delay.init(this, SAVE | SPY, "actual_PSD_t1_delay", "wanted_PSD_t1_delay","PSD T1");
PSD_t1Delay.setUnit("~mus");
DIFFDET_t2TofValidation.init(this, SAVE | SPY, "actual_DIFFDET_t2_tofvalidation", "wanted_DIFFDET_t2_tofvalidation", "DiffDetT2");
DIFFDET_t2TofValidation.setUnit("~mus");
DIFFDET_t1Delay.init(this, SAVE | SPY, "actual_DIFFDET_t1_delay", "wanted_DIFFDET_t1_delay","DiffDetT1");
DIFFDET_t1Delay.setUnit("~mus");
nbDeadChannels.init(this, SAVE, "actual_dead_nchannels", "wanted_dead_nchannels", "NbDeadChan");
......@@ -76,6 +80,8 @@ void IN16bDopplerTOFSettings::start() {
m_in16bController->SD_t1Delay.setpoint = SD_t1Delay.setpoint();
m_in16bController->PSD_t2TofValidation.setpoint = PSD_t2TofValidation.setpoint();
m_in16bController->PSD_t1Delay.setpoint = PSD_t1Delay.setpoint();
m_in16bController->DIFFDET_t2TofValidation.setpoint = DIFFDET_t2TofValidation.setpoint();
m_in16bController->DIFFDET_t1Delay.setpoint = DIFFDET_t1Delay.setpoint();
m_in16bController->nbDeadChannels = nbDeadChannels.setpoint();
......@@ -94,6 +100,8 @@ void IN16bDopplerTOFSettings::start() {
SD_t1Delay = SD_t1Delay.setpoint();
PSD_t2TofValidation = PSD_t2TofValidation.setpoint();
PSD_t1Delay = PSD_t1Delay.setpoint();
DIFFDET_t2TofValidation = DIFFDET_t2TofValidation.setpoint();
DIFFDET_t1Delay = DIFFDET_t1Delay.setpoint();
nbDeadChannels = nbDeadChannels.setpoint();
}
......
......@@ -47,6 +47,8 @@ public:
Property<float64,SETPOINT> SD_t1Delay;
Property<float64,SETPOINT> PSD_t2TofValidation;
Property<float64,SETPOINT> PSD_t1Delay;
Property<float64,SETPOINT> DIFFDET_t2TofValidation;
Property<float64,SETPOINT> DIFFDET_t1Delay;
Property<int32,SETPOINT> nbDeadChannels;
......
......@@ -3,8 +3,9 @@ in16bdopplertofsettings.acquisitionCardTitle=Acquisition card
in16bdopplertofsettings.nChannelsPrefix=Number of channels
in16bdopplertofsettings.nChannelsCommandPrefix=Num channels
in16bdopplertofsettings.T1_MONIPrefix=MONI T1
in16bdopplertofsettings.T1_SDPrefix=SD T1
in16bdopplertofsettings.T1_PSDPrefix=PSD T1
in16bdopplertofsettings.T1_SDPrefix=SD T1
in16bdopplertofsettings.T1_PSDPrefix=PSD T1
in16bdopplertofsettings.T1_DIFFDETPrefix=DIFFDET T1
in16bdopplertofsettings.MONI_T1Prefix=T1: MONI
in16bdopplertofsettings.MONI_T2Prefix=T2: MONI
in16bdopplertofsettings.SD_T1Prefix=SD
......
......@@ -2,16 +2,18 @@
<controller type="in16bdopplertofsettings" role="in16bdopplertofsettings1"/>
<property_switcher role="in16bdopplertofsettings1" property="n_acqcontrollers" switcher_key="n_acqcontrollersSwitcher"/>
<group title="in16bdopplertofsettings.tofParametersTitle">
<text role="in16bdopplertofsettings1" property="wanted_MONI_t1_delay" prefix="in16bdopplertofsettings.T1_MONIPrefix" suffix="in16bdopplertofsettings.microSec"/>
<text role="in16bdopplertofsettings1" property="wanted_MONI_t2_tofvalidation" prefix="in16bdopplertofsettings.T2Prefix" suffix="in16bdopplertofsettings.microSec"/>
<newLine/>
<text role="in16bdopplertofsettings1" property="wanted_SD_t1_delay" prefix="in16bdopplertofsettings.T1_SDPrefix" suffix="in16bdopplertofsettings.microSec"/>
<text role="in16bdopplertofsettings1" property="wanted_SD_t2_tofvalidation" prefix="in16bdopplertofsettings.T2Prefix" suffix="in16bdopplertofsettings.microSec"/>
<newLine/>
<text role="in16bdopplertofsettings1" property="wanted_PSD_t1_delay" prefix="in16bdopplertofsettings.T1_PSDPrefix" suffix="in16bdopplertofsettings.microSec"/>
<text role="in16bdopplertofsettings1" property="wanted_PSD_t2_tofvalidation" prefix="in16bdopplertofsettings.T2Prefix" suffix="in16bdopplertofsettings.microSec"/>
<newLine/>
<group title="in16bdopplertofsettings.tofParametersTitle" alignment="top_right">
<table_composite nbColumns="2">
<text role="in16bdopplertofsettings1" property="wanted_MONI_t1_delay" prefix="in16bdopplertofsettings.T1_MONIPrefix" suffix="in16bdopplertofsettings.microSec" hAlignment="right"/>
<text role="in16bdopplertofsettings1" property="wanted_MONI_t2_tofvalidation" prefix="in16bdopplertofsettings.T2Prefix" suffix="in16bdopplertofsettings.microSec"/>
<text role="in16bdopplertofsettings1" property="wanted_SD_t1_delay" prefix="in16bdopplertofsettings.T1_SDPrefix" suffix="in16bdopplertofsettings.microSec" hAlignment="right"/>
<text role="in16bdopplertofsettings1" property="wanted_SD_t2_tofvalidation" prefix="in16bdopplertofsettings.T2Prefix" suffix="in16bdopplertofsettings.microSec"/>
<text role="in16bdopplertofsettings1" property="wanted_PSD_t1_delay" prefix="in16bdopplertofsettings.T1_PSDPrefix" suffix="in16bdopplertofsettings.microSec" hAlignment="right"/>
<text role="in16bdopplertofsettings1" property="wanted_PSD_t2_tofvalidation" prefix="in16bdopplertofsettings.T2Prefix" suffix="in16bdopplertofsettings.microSec"/>
<text role="in16bdopplertofsettings1" property="wanted_DIFFDET_t1_delay" prefix="in16bdopplertofsettings.T1_DIFFDETPrefix" suffix="in16bdopplertofsettings.microSec" hAlignment="right"/>
<text role="in16bdopplertofsettings1" property="wanted_DIFFDET_t2_tofvalidation" prefix="in16bdopplertofsettings.T2Prefix" suffix="in16bdopplertofsettings.microSec"/>
</table_composite>
s <newLine/>
<text role="in16bdopplertofsettings1" property="wanted_dead_nchannels" prefix="in16bdopplertofsettings.deadnChannelsCommandPrefix"/>
</group>
<newLine/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment