Commit 41ed3171 authored by yannick legoc's avatar yannick legoc

Merge branch 'V3.2_191' of https://code.ill.fr/instrument-control/nomad-modules into V3.2_191

parents 7ad92ad6 7f7ccf81
...@@ -35,7 +35,7 @@ void CountProperties::init(const std::string& name) { ...@@ -35,7 +35,7 @@ void CountProperties::init(const std::string& name) {
currentTotalReps.init(this, NOSAVE | SPY, "currenttotalrepetition", "ActualRepet"); currentTotalReps.init(this, NOSAVE | SPY, "currenttotalrepetition", "ActualRepet");
currentLocalReps.init(this, NOSAVE | SPY, "currentlocalrepetition", "ActualRepaint"); currentLocalReps.init(this, NOSAVE | SPY, "currentlocalrepetition", "ActualRepaint");
saveData.init(this, SAVE, "savedata"); saveData.init(this, SAVE, "savedata");
statusMessage.init(this, NOSAVE, "status_message"); statusMessage.init(this, NOSAVE | SPY, "status_message");
logStyle.init(this, SAVE, "log_style"); logStyle.init(this, SAVE, "log_style");
logTitle.init(this, NOSAVE, "log_title"); logTitle.init(this, NOSAVE, "log_title");
logValues.init(this, NOSAVE, "log_values"); logValues.init(this, NOSAVE, "log_values");
......
...@@ -273,7 +273,7 @@ void AcquisitionSerializer::sendData(bool is3Ddata, string imageName) { ...@@ -273,7 +273,7 @@ void AcquisitionSerializer::sendData(bool is3Ddata, string imageName) {
data.set_propid(getProposalId()); data.set_propid(getProposalId());
data.set_proposal(getProposalName()); data.set_proposal(getProposalName());
data.set_instrid(getInstrumentId()); data.set_instrid(getInstrumentId());
data.set_instrument(getInstrumentName()); data.set_instrument(getInstrumentCode());
data.set_sampid(getSampleId()); data.set_sampid(getSampleId());
data.set_sample(getSampleName()); data.set_sample(getSampleName());
data.set_cycle(getCycleId()); data.set_cycle(getCycleId());
...@@ -327,8 +327,8 @@ string AcquisitionSerializer::getInstrumentId() { ...@@ -327,8 +327,8 @@ string AcquisitionSerializer::getInstrumentId() {
return m_experimentData->instrumentId(); return m_experimentData->instrumentId();
} }
string AcquisitionSerializer::getInstrumentName() { string AcquisitionSerializer::getInstrumentCode() {
return m_experimentData->instrumentName(); return m_experimentData->instrumentCode();
} }
string AcquisitionSerializer::getSampleId() { string AcquisitionSerializer::getSampleId() {
......
...@@ -85,7 +85,7 @@ private: ...@@ -85,7 +85,7 @@ private:
std::string getProposalId(); std::string getProposalId();
std::string getProposalName(); std::string getProposalName();
std::string getInstrumentId(); std::string getInstrumentId();
std::string getInstrumentName(); std::string getInstrumentCode();
std::string getSampleId(); std::string getSampleId();
std::string getSampleName(); std::string getSampleName();
std::string getCycleId(); std::string getCycleId();
......
...@@ -76,8 +76,8 @@ D19ScanSequencer::D19ScanSequencer(const string& name) : ...@@ -76,8 +76,8 @@ D19ScanSequencer::D19ScanSequencer(const string& name) :
time.init(this, SAVE, "wanted_time", "Timedy"); time.init(this, SAVE, "wanted_time", "Timedy");
timeType.init(this, SAVE, "time_type", "Unitdy"); timeType.init(this, SAVE, "time_type", "Unitdy");
UseCheckReflection.init(this, SAVE, "useCheckReflection"); useCheckReflection.init(this, SAVE, "useCheckReflection");
UseSafePosAfter.init(this, SAVE, "useSafePosAfter"); useSafePosAfter.init(this, SAVE, "useSafePosAfter");
// Link // Link
axisGamma.init(this, "gamma"); axisGamma.init(this, "gamma");
...@@ -123,8 +123,8 @@ void D19ScanSequencer::allocateArray() { ...@@ -123,8 +123,8 @@ void D19ScanSequencer::allocateArray() {
time.resize(value); time.resize(value);
timeType.resize(value); timeType.resize(value);
UseCheckReflection.resize(value); useCheckReflection.resize(value);
UseSafePosAfter.resize(value); useSafePosAfter.resize(value);
/* /*
for (int32 ki = 0; ki<25; ki++){ for (int32 ki = 0; ki<25; ki++){
...@@ -281,7 +281,7 @@ void D19ScanSequencer::start() { ...@@ -281,7 +281,7 @@ void D19ScanSequencer::start() {
if (isStopped()) { if (isStopped()) {
break; break;
} }
if (UseCheckReflection.get(currentScan())) { if (useCheckReflection.get(currentScan())) {
cout << " start CheckReflectionContr " << endl; cout << " start CheckReflectionContr " << endl;
m_scan_active = true; m_scan_active = true;
CheckReflectionContr->startCommand(true); CheckReflectionContr->startCommand(true);
...@@ -290,7 +290,7 @@ void D19ScanSequencer::start() { ...@@ -290,7 +290,7 @@ void D19ScanSequencer::start() {
if (isStopped()) { if (isStopped()) {
break; break;
} }
if (UseSafePosAfter.get(currentScan())) { if (useSafePosAfter.get(currentScan())) {
cout << " start SafePosAfter" << endl; cout << " start SafePosAfter" << endl;
savePosContr->startCommand(true); savePosContr->startCommand(true);
} }
......
...@@ -87,8 +87,8 @@ public: ...@@ -87,8 +87,8 @@ public:
DynamicProperty<float64> time; DynamicProperty<float64> time;
DynamicProperty<std::string> timeType; DynamicProperty<std::string> timeType;
DynamicProperty<bool> UseCheckReflection; DynamicProperty<bool> useCheckReflection;
DynamicProperty<bool> UseSafePosAfter; DynamicProperty<bool> useSafePosAfter;
ControllerPtr<axis::AxisController> axisGamma; //! Axis link ControllerPtr<axis::AxisController> axisGamma; //! Axis link
ControllerPtr<axis::AxisController> axisOmega; //! Axis link ControllerPtr<axis::AxisController> axisOmega; //! Axis link
......
...@@ -55,10 +55,10 @@ HighCountsCheck::HighCountsCheck(const string& name) : ...@@ -55,10 +55,10 @@ HighCountsCheck::HighCountsCheck(const string& name) :
ithresh2.init(this, SAVE, "ithresh2", "ithresh2"); ithresh2.init(this, SAVE, "ithresh2", "ithresh2");
ithresh3.init(this, SAVE, "ithresh3", "ithresh3"); ithresh3.init(this, SAVE, "ithresh3", "ithresh3");
errorTresh1.init(this, SAVE, "error_thresh1"); errorTresh1.init(this, SAVE, "error_thresh1","Errthresh1");
errorTresh2.init(this, SAVE, "error_thresh2"); errorTresh2.init(this, SAVE, "error_thresh2","Errthresh2");
errorTresh3.init(this, SAVE, "error_thresh3"); errorTresh3.init(this, SAVE, "error_thresh3","error_thresh3");
errorShutter.init(this, SAVE, "errorShutter","ErrShutter");
indPannelThresh1.init(this, SAVE, "indPannelThresh1", "indPannelThresh1"); indPannelThresh1.init(this, SAVE, "indPannelThresh1", "indPannelThresh1");
indPannelThresh2.init(this, SAVE, "indPannelThresh2", "indPannelThresh2"); indPannelThresh2.init(this, SAVE, "indPannelThresh2", "indPannelThresh2");
indPannelThresh3.init(this, SAVE, "indPannelThresh3", "indPannelThresh3"); indPannelThresh3.init(this, SAVE, "indPannelThresh3", "indPannelThresh3");
...@@ -72,6 +72,7 @@ HighCountsCheck::HighCountsCheck(const string& name) : ...@@ -72,6 +72,7 @@ HighCountsCheck::HighCountsCheck(const string& name) :
// m_DetectorElement.init(this, "detector"); // m_DetectorElement.init(this, "detector");
m_Contr1Shutter.init(this, "shutter1"); m_Contr1Shutter.init(this, "shutter1");
m_ContrScanOmega.init(this, "scanOmega"); m_ContrScanOmega.init(this, "scanOmega");
m_ContrSom.init(this, "scanSom");
m_ContrD19ScanSequencer.init(this, "d19_scan_sequencer"); m_ContrD19ScanSequencer.init(this, "d19_scan_sequencer");
m_Omega.init(this, "omega"); m_Omega.init(this, "omega");
...@@ -174,7 +175,7 @@ void HighCountsCheck::updateStatus() { ...@@ -174,7 +175,7 @@ void HighCountsCheck::updateStatus() {
* startHighCountsCheckControl * startHighCountsCheckControl
*/ */
void HighCountsCheck::startHighCountsCheckControl() { void HighCountsCheck::startHighCountsCheckControl() {
//cout << "HighCountsCheck::startHighCountsCheckControl " << endl; /* //cout << "HighCountsCheck::startHighCountsCheckControl " << endl;
refreshTime = 2; refreshTime = 2;
errorTresh1 = false; errorTresh1 = false;
...@@ -291,22 +292,25 @@ void HighCountsCheck::startHighCountsCheckControl() { ...@@ -291,22 +292,25 @@ void HighCountsCheck::startHighCountsCheckControl() {
delete[] l_ic_rate; delete[] l_ic_rate;
m_Counting = false; m_Counting = false;
m_StopRequested = false; m_StopRequested = false;
commandStatus.setIdle(); commandStatus.setIdle();*/
} }
void HighCountsCheck::shutterStatus(){ void HighCountsCheck::shutterStatus(){
if (m_Contr1Shutter->isClose()) { if (m_Contr1Shutter->isClose()) {
cout << " HighCountsCheck::shutterStatus isClose" << endl; cout << " HighCountsCheck::shutterStatus isClose" << endl;
//log(Level::s_Error) << "DANGER - attenuator is close " << endlog; log(Level::s_Error) << "DANGER - attenuator is close " << endlog;
errorShutter = -1;
m_StopRequested = true; m_StopRequested = true;
} else { } else {
cout << " HighCountsCheck::shutterStatus isOpen" << endl; cout << " HighCountsCheck::shutterStatus isOpen" << endl;
errorShutter = 0;
//log(Level::s_Error) << "DANGER - error cannot close attenuator" << endlog; //log(Level::s_Error) << "DANGER - error cannot close attenuator" << endlog;
} }
if (m_Contr1Shutter->isClose()) { if (m_Contr1Shutter->isClose()) {
actionForHighLevel(); cout << " HighCountsCheck::shutterStatus isClose 02 " << endl;
boost::thread td(boost::bind(&HighCountsCheck::actionForHighLevel, this));
} }
} }
...@@ -314,23 +318,17 @@ void HighCountsCheck::shutterStatus(){ ...@@ -314,23 +318,17 @@ void HighCountsCheck::shutterStatus(){
void HighCountsCheck::actionForHighLevel() { void HighCountsCheck::actionForHighLevel() {
// m_Contr1Shutter->setClose();
// m_Contr1Shutter->startCommand();
// if (m_Contr1Shutter->isClose()) {
// log(Level::s_Error) << "DANGER - attenuator is close " << endlog;
// m_StopRequested = true;
// } else {
// log(Level::s_Error) << "DANGER - error cannot close attenuator" << endlog;
// }
// Find the good Omega scan
scan::ParameterizableScan1D* scan = NULL; scan::ParameterizableScan1D* scan = NULL;
if (m_ContrD19ScanSequencer->isStarted()) { if (m_ContrD19ScanSequencer->isStarted()) {
scan = m_ContrD19ScanSequencer->scanContr.get(); scan = m_ContrD19ScanSequencer->scanContr.get();
} } else if (m_ContrSom->isStarted()) {
if (m_ContrScanOmega->isStarted()) { scan = m_ContrSom.get();
} else if (m_ContrScanOmega->isStarted()) {
scan = m_ContrScanOmega.get(); scan = m_ContrScanOmega.get();
} }
// Sequence if threshold3 reached on a panel during a omegascan // Sequence if threshold3 reached on a panel during a omegascan
// 1-> pause the current scan // 1-> pause the current scan
// 2-> put the shutter to protect the detector // 2-> put the shutter to protect the detector
...@@ -339,6 +337,31 @@ void HighCountsCheck::actionForHighLevel() { ...@@ -339,6 +337,31 @@ void HighCountsCheck::actionForHighLevel() {
// 5-> stop the Count of this scan-step // 5-> stop the Count of this scan-step
// 6-> result the scan will restart but next will be shifted by 2 degree and we jump over the space with high intensity // 6-> result the scan will restart but next will be shifted by 2 degree and we jump over the space with high intensity
int32 nrepeat = 0;
while ((nrepeat < 4) && (m_Contr1Shutter->isClose())) {
cout << "FRA001" <<endl;
m_Contr1Shutter->setOpen();
m_Contr1Shutter->startCommand();
log(Level::s_Info) << "Try to remove Shutter" << endlog;
nrepeat++;
sleep(nrepeat);
cout << "FRA002" <<endl;
sleep(5);
cout << "FRA003" <<endl;
}
if (m_Contr1Shutter->isClose()) {
log(Level::s_Error) << "SHUTTER - still close !!!!!! " << endlog;
}else {
log(Level::s_Info) << "SHUTTER - reopen " << endlog;
}
if (scan != NULL) { if (scan != NULL) {
scan->pauseParallel(); scan->pauseParallel();
while(scan->isPaused() == false) { while(scan->isPaused() == false) {
......
...@@ -82,6 +82,7 @@ public: ...@@ -82,6 +82,7 @@ public:
Property<bool> errorTresh1; Property<bool> errorTresh1;
Property<bool> errorTresh2; Property<bool> errorTresh2;
Property<bool> errorTresh3; Property<bool> errorTresh3;
Property<int32> errorShutter;
Property<int32> indPannelThresh1; Property<int32> indPannelThresh1;
Property<int32> indPannelThresh2; Property<int32> indPannelThresh2;
Property<int32> indPannelThresh3; Property<int32> indPannelThresh3;
...@@ -129,6 +130,7 @@ private: ...@@ -129,6 +130,7 @@ private:
ControllerPtr<stateio::ShutterController> m_Contr1Shutter; ControllerPtr<stateio::ShutterController> m_Contr1Shutter;
ControllerPtr<scan::ParameterizableScan1D> m_ContrScanOmega; ControllerPtr<scan::ParameterizableScan1D> m_ContrScanOmega;
ControllerPtr<scan::ParameterizableScan1D> m_ContrSom;
ControllerPtr<d19::D19ScanSequencer> m_ContrD19ScanSequencer ; ControllerPtr<d19::D19ScanSequencer> m_ContrD19ScanSequencer ;
ControllerPtr<axis::AxisController> m_Omega ; ControllerPtr<axis::AxisController> m_Omega ;
......
...@@ -7,13 +7,11 @@ d19_scan_sequencer.UsePPPGamma= ...@@ -7,13 +7,11 @@ d19_scan_sequencer.UsePPPGamma=
d19_scan_sequencer.UsePPPGammaCheckedValue=true d19_scan_sequencer.UsePPPGammaCheckedValue=true
d19_scan_sequencer.UsePPPGammaUncheckedValue=false d19_scan_sequencer.UsePPPGammaUncheckedValue=false
d19_scan_sequencer.UseCheckRefl=
d19_scan_sequencer.UseCheckReflCheckedValue=true d19_scan_sequencer.UseCheckReflCheckedValue=true
d19_scan_sequencer.UseCheckReflcheckedValue=false d19_scan_sequencer.UseCheckReflUncheckedValue=false
d19_scan_sequencer.UseSafePosAfter=
d19_scan_sequencer.UseSafePosAfterCheckedValue=true d19_scan_sequencer.UseSafePosAfterCheckedValue=true
d19_scan_sequencer.UseSafePosAftercheckedValue=false d19_scan_sequencer.UseSafePosAfterUncheckedValue=false
d19_scan_sequencer.lGamma=Gamma d19_scan_sequencer.lGamma=Gamma
......
...@@ -17,95 +17,65 @@ ...@@ -17,95 +17,65 @@
<text role="d19_scan_sequencer1" property="wanted_countsMain" spaceBefore="false" /> <text role="d19_scan_sequencer1" property="wanted_countsMain" spaceBefore="false" />
</switchable_composite> </switchable_composite>
<newLine /> <newLine />
<composite> <composite>
<table_composite nbColumns="14" > <style spacing="minimum">
<table_composite nbColumns="8" >
<simple_label prefix="d19_scan_sequencer.UsePPP" font_size="8" font_style="BOLD" />
<simple_label prefix="d19_scan_sequencer.UsePPP" font_size="8" font_style="BOLD" />
<simple_label prefix="d19_scan_sequencer.lOmega" font_size="8" font_style="BOLD" /> <simple_label prefix="d19_scan_sequencer.lOmega" font_size="8" font_style="BOLD" />
<simple_label prefix="d19_scan_sequencer.lChi" font_size="8" font_style="BOLD" /> <simple_label prefix="d19_scan_sequencer.lChi" font_size="8" font_style="BOLD" />
<simple_label prefix="d19_scan_sequencer.lPhi" font_size="8" font_style="BOLD" /> <simple_label prefix="d19_scan_sequencer.lPhi" font_size="8" font_style="BOLD" />
<simple_label prefix="d19_scan_sequencer.scanOmeMin" font_size="8" font_style="BOLD" />
<simple_label prefix="d19_scan_sequencer.UsePPPGamma" font_size="8" font_style="BOLD" /> <simple_label prefix="d19_scan_sequencer.scanOmeMax" font_size="8" font_style="BOLD" />
<simple_label prefix="d19_scan_sequencer.lGamma" font_size="8" font_style="BOLD" /> <simple_label prefix="d19_scan_sequencer.lCheckRefl" font_size="8" font_style="BOLD" />
<simple_label prefix="d19_scan_sequencer.lSafePos" font_size="8" font_style="BOLD" />
<simple_label prefix="d19_scan_sequencer.empty" font_size="8" font_style="BOLD" horizontal_span="1" />
<simple_label prefix="d19_scan_sequencer.scanTypePrefix" font_size="8" font_style="BOLD" /> <dynamic_composite role="d19_scan_sequencer1" properties="use_ppp,ppp_wanted_omega,ppp_wanted_chi,ppp_wanted_phi,scanVal1,scanVal2,useCheckReflection,useSafePosAfter,simplelabel0,simplelabel1,simplelabel2" ignore="simplelabel0,simplelabel1,simplelabel2">
<simple_label prefix="d19_scan_sequencer.empty" font_size="8" font_style="BOLD" horizontal_span="4" />
<simple_label prefix="d19_scan_sequencer.lCheckRefl" font_size="8" font_style="BOLD" />
<simple_label prefix="d19_scan_sequencer.lSafePos" font_size="8" font_style="BOLD" />
<dynamic_composite role="d19_scan_sequencer1" properties="use_ppp,use_ppp_gamma,ppp_wanted_gamma,ppp_wanted_omega,ppp_wanted_chi,ppp_wanted_phi,scanVal1,scanVal2,scanVal3,useCheckReflection,useSafePosAfter,simplelabel0,simplelabel1,simplelabel1,simplelabel2,simplelabel3,simplelabel4,simplelabel5,simplelabel6,simplelabel7,simplelabel8" ignore="simplelabel0,simplelabel1,simplelabel1,simplelabel2,simplelabel3,simplelabel4,simplelabel5,simplelabel6,simplelabel7,simplelabel8">
<property_switcher role="d19_scan_sequencer1" property="use_ppp" switcher_key="use_ppp" /> <property_switcher role="d19_scan_sequencer1" property="use_ppp" switcher_key="use_ppp" />
<property_switcher role="d19_scan_sequencer1" property="use_ppp_gamma" switcher_key="use_ppp_gamma" />
<check role="d19_scan_sequencer1" property="use_ppp" checkBoxValues="d19_scan_sequencer.UsePPP" /> <check role="d19_scan_sequencer1" property="use_ppp" checkBoxValues="d19_scan_sequencer.UsePPP" />
<switchable_composite switch_values="true" switcher_key="use_ppp"> <switchable_composite switch_values="true" switcher_key="use_ppp">
<text role="d19_scan_sequencer1" property="ppp_wanted_omega" /> <text role="d19_scan_sequencer1" property="ppp_wanted_omega" />
</switchable_composite> </switchable_composite>
<switchable_composite switch_values="false" switcher_key="use_ppp"> <switchable_composite switch_values="false" switcher_key="use_ppp">
<simple_label prefix="" key="simplelabel0"/> <simple_label prefix="a1" key="simplelabel0"/>
</switchable_composite> </switchable_composite>
<switchable_composite switch_values="true" switcher_key="use_ppp"> <switchable_composite switch_values="true" switcher_key="use_ppp">
<text role="d19_scan_sequencer1" property="ppp_wanted_chi" /> <text role="d19_scan_sequencer1" property="ppp_wanted_chi" />
</switchable_composite> </switchable_composite>
<switchable_composite switch_values="false" switcher_key="use_ppp"> <switchable_composite switch_values="false" switcher_key="use_ppp">
<simple_label prefix="" key="simplelabel1"/> <simple_label prefix="a2" key="simplelabel1"/>
</switchable_composite> </switchable_composite>
<switchable_composite switch_values="true" switcher_key="use_ppp"> <switchable_composite switch_values="true" switcher_key="use_ppp">
<text role="d19_scan_sequencer1" property="ppp_wanted_phi" /> <text role="d19_scan_sequencer1" property="ppp_wanted_phi" />
</switchable_composite> </switchable_composite>
<switchable_composite switch_values="false" switcher_key="use_ppp"> <switchable_composite switch_values="false" switcher_key="use_ppp">
<simple_label prefix="" key="simplelabel2"/> <simple_label prefix="a3" key="simplelabel2"/>
</switchable_composite>
<switchable_composite switch_values="true" switcher_key="use_ppp">
<check role="d19_scan_sequencer1" property="use_ppp_gamma" checkBoxValues="d19_scan_sequencer.UsePPPGamma" />
</switchable_composite>
<switchable_composite switch_values="false" switcher_key="use_ppp">
<simple_label prefix="" key="simplelabel3"/>
</switchable_composite>
<switchable_composite switch_values="false" switcher_key="use_ppp">
<simple_label prefix="" key="simplelabel4"/>
</switchable_composite>
<switchable_composite switch_values="true" switcher_key="use_ppp">
<switchable_composite switch_values="true" switcher_key="use_ppp_gamma">
<text role="d19_scan_sequencer1" property="ppp_wanted_gamma" />
</switchable_composite>
<switchable_composite switch_values="false" switcher_key="use_ppp_gamma">
<simple_label prefix="" key="simplelabel5"/>
</switchable_composite>
</switchable_composite> </switchable_composite>
<!-- Scan properties --><!--
<combo role="d19_scan_sequencer1" property="scanType" <text role="d19_scan_sequencer1" property="scanVal1" />
valuesAndLabels="d19_scan_sequencer.mode1,d19_scan_sequencer.mode2,d19_scan_sequencer.mode3" /> -->
<simple_label prefix="d19_scan_sequencer.first" key="simplelabel6"/>
<text role="d19_scan_sequencer1" property="scanVal1" />
<simple_label prefix="d19_scan_sequencer.last" key="simplelabel7"/> <text role="d19_scan_sequencer1" property="scanVal2" />
<text role="d19_scan_sequencer1" property="scanVal2" />
<simple_label prefix="d19_scan_sequencer.step" key="simplelabel8"/>
<text role="d19_scan_sequencer1" property="scanVal3" />
<check role="d19_scan_sequencer1" property="useCheckReflection" checkBoxValues="d19_scan_sequencer.UseCheckRefl" /> <check role="d19_scan_sequencer1" property="useCheckReflection" checkBoxValues="d19_scan_sequencer.UseCheckRefl" />
<check role="d19_scan_sequencer1" property="useSafePosAfter" checkBoxValues="d19_scan_sequencer.UseSafePosAfter" /> <check role="d19_scan_sequencer1" property="useSafePosAfter" checkBoxValues="d19_scan_sequencer.UseSafePosAfter" />
</dynamic_composite> </dynamic_composite>
</table_composite> </table_composite>
</style>
</composite> </composite>
......
...@@ -31,22 +31,20 @@ ...@@ -31,22 +31,20 @@
<composite> <composite>
<style spacing="minimum"> <style spacing="minimum">
<table_composite nbColumns="10" > <table_composite nbColumns="8" >
<!--
<simple_label prefix="d19_scan_sequencer.UsePPP" font_size="8" font_style="BOLD" /> <simple_label prefix="d19_scan_sequencer.UsePPP" font_size="8" font_style="BOLD" />
<simple_label prefix="d19_scan_sequencer.lOmega" font_size="8" font_style="BOLD" /> <simple_label prefix="d19_scan_sequencer.lOmega" font_size="8" font_style="BOLD" />
<simple_label prefix="d19_scan_sequencer.lChi" font_size="8" font_style="BOLD" /> <simple_label prefix="d19_scan_sequencer.lChi" font_size="8" font_style="BOLD" />
<simple_label prefix="d19_scan_sequencer.lPhi" font_size="8" font_style="BOLD" /> <simple_label prefix="d19_scan_sequencer.lPhi" font_size="8" font_style="BOLD" />
<simple_label prefix="d19_scan_sequencer.UsePPPGamma" font_size="8" font_style="BOLD" />
<simple_label prefix="d19_scan_sequencer.lGamma" font_size="8" font_style="BOLD" />
<simple_label prefix="d19_scan_sequencer.scanOmeMin" font_size="8" font_style="BOLD" /> <simple_label prefix="d19_scan_sequencer.scanOmeMin" font_size="8" font_style="BOLD" />
<simple_label prefix="d19_scan_sequencer.scanOmeMax" font_size="8" font_style="BOLD" /> <simple_label prefix="d19_scan_sequencer.scanOmeMax" font_size="8" font_style="BOLD" />
<simple_label prefix="d19_scan_sequencer.lCheckRefl" font_size="8" font_style="BOLD" /> <simple_label prefix="d19_scan_sequencer.lCheckRefl" font_size="8" font_style="BOLD" />
<simple_label prefix="d19_scan_sequencer.lSafePos" font_size="8" font_style="BOLD" /> <simple_label prefix="d19_scan_sequencer.lSafePos" font_size="8" font_style="BOLD" />
-->
<dynamic_composite role="d19_scan_sequencer1" properties="use_ppp,use_ppp_gamma,ppp_wanted_gamma,ppp_wanted_omega,ppp_wanted_chi,ppp_wanted_phi,scanVal1,scanVal2,useCheckReflection,useSafePosAfter,simplelabel0,simplelabel1,simplelabel1,simplelabel2,simplelabel3,simplelabel4,simplelabel5,simplelabel6,simplelabel7" ignore="simplelabel0,simplelabel1,simplelabel1,simplelabel2,simplelabel3,simplelabel4,simplelabel5,simplelabel6,simplelabel7"> <dynamic_composite role="d19_scan_sequencer1" properties="use_ppp,ppp_wanted_omega,ppp_wanted_chi,ppp_wanted_phi,scanVal1,scanVal2,useCheckReflection,useSafePosAfter,simplelabel0,simplelabel1,simplelabel2" ignore="simplelabel0,simplelabel1,simplelabel2">
<property_switcher role="d19_scan_sequencer1" property="use_ppp" switcher_key="use_ppp" />
<property_switcher role="d19_scan_sequencer1" property="use_ppp_gamma" switcher_key="use_ppp_gamma" /> <property_switcher role="d19_scan_sequencer1" property="use_ppp" switcher_key="use_ppp" />
<check role="d19_scan_sequencer1" property="use_ppp" checkBoxValues="d19_scan_sequencer.UsePPP" /> <check role="d19_scan_sequencer1" property="use_ppp" checkBoxValues="d19_scan_sequencer.UsePPP" />
...@@ -54,51 +52,24 @@ ...@@ -54,51 +52,24 @@
<text role="d19_scan_sequencer1" property="ppp_wanted_omega" /> <text role="d19_scan_sequencer1" property="ppp_wanted_omega" />
</switchable_composite> </switchable_composite>
<switchable_composite switch_values="false" switcher_key="use_ppp"> <switchable_composite switch_values="false" switcher_key="use_ppp">
<simple_label prefix="" key="simplelabel0"/> <simple_label prefix="a1" key="simplelabel0"/>
</switchable_composite> </switchable_composite>
<switchable_composite switch_values="true" switcher_key="use_ppp"> <switchable_composite switch_values="true" switcher_key="use_ppp">
<text role="d19_scan_sequencer1" property="ppp_wanted_chi" /> <text role="d19_scan_sequencer1" property="ppp_wanted_chi" />
</switchable_composite> </switchable_composite>
<switchable_composite switch_values="false" switcher_key="use_ppp"> <switchable_composite switch_values="false" switcher_key="use_ppp">
<simple_label prefix="" key="simplelabel1"/> <simple_label prefix="a2" key="simplelabel1"/>
</switchable_composite> </switchable_composite>
<switchable_composite switch_values="true" switcher_key="use_ppp"> <switchable_composite switch_values="true" switcher_key="use_ppp">
<text role="d19_scan_sequencer1" property="ppp_wanted_phi" /> <text role="d19_scan_sequencer1" property="ppp_wanted_phi" />
</switchable_composite> </switchable_composite>
<switchable_composite switch_values="false" switcher_key="use_ppp"> <switchable_composite switch_values="false" switcher_key="use_ppp">
<simple_label prefix="" key="simplelabel2"/> <simple_label prefix="a3" key="simplelabel2"/>
</switchable_composite>
<switchable_composite switch_values="true" switcher_key="use_ppp">
<check role="d19_scan_sequencer1" property="use_ppp_gamma" checkBoxValues="d19_scan_sequencer.UsePPPGamma" />
</switchable_composite>
<switchable_composite switch_values="false" switcher_key="use_ppp">
<simple_label prefix="" key="simplelabel3"/>
</switchable_composite>
<switchable_composite switch_values="false" switcher_key="use_ppp">
<simple_label prefix="" key="simplelabel4"/>
</switchable_composite> </switchable_composite>
<switchable_composite switch_values="true" switcher_key="use_ppp">
<switchable_composite switch_values="true" switcher_key="use_ppp_gamma">
<text role="d19_scan_sequencer1" property="ppp_wanted_gamma" />
</switchable_composite>
<switchable_composite switch_values="false" switcher_key="use_ppp_gamma">
<simple_label prefix="" key="simplelabel5"/>
</switchable_composite>
</switchable_composite>
<!-- Scan properties --><!--
<combo role="d19_scan_sequencer1" property="scanType"
valuesAndLabels="d19_scan_sequencer.mode1,d19_scan_sequencer.mode2,d19_scan_sequencer.mode3" /> -->
<text role="d19_scan_sequencer1" property="scanVal1" />