From e14ceb6947b41d9a7050de301f2ab23c501ff97c Mon Sep 17 00:00:00 2001
From: galperti <cristian.galperti@epfl.ch>
Date: Thu, 23 Jun 2022 14:05:04 +0200
Subject: [PATCH] scd based MDS server/tree inside template algoobj
---
algos/template/algoobj_template.m | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/algos/template/algoobj_template.m b/algos/template/algoobj_template.m
index c065ff9..5094e17 100644
--- a/algos/template/algoobj_template.m
+++ b/algos/template/algoobj_template.m
@@ -13,28 +13,30 @@ obj=obj.addfpinitfcn('algo_template_loadfp','algo_template_fp');
obj=obj.addtunparamstruct('algo_template_tp', @()algo_template_loadtp(), false);
%% Tunable parameters
-parshot=10;
-obj=obj.addparameter(SCDclass_mdsparnumeric('kb1','enable' ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
-obj=obj.addparameter(SCDclass_mdsparnumeric('ks1','gain' ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
-obj=obj.addparameter(SCDclass_mdsparnumeric('ks2','refmodel.gain' ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
-obj=obj.addparameter(SCDclass_mdsparnumeric('kv1','rowvect' ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
-obj=obj.addparameter(SCDclass_mdsparnumeric('kv2','colvect' ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
-obj=obj.addparameter(SCDclass_mdsparnumeric('km1','matrix' ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
+parshot=-1;
+mdsserver='scd.epfl.ch';
+mdstree ='scdds';
+obj=obj.addparameter(SCDclass_mdsparnumeric('template.params.kb1','enable' ,'srcsrv',mdsserver,'srctree',mdstree,'shot',parshot));
+obj=obj.addparameter(SCDclass_mdsparnumeric('template.params.ks1','gain' ,'srcsrv',mdsserver,'srctree',mdstree,'shot',parshot));
+obj=obj.addparameter(SCDclass_mdsparnumeric('template.params.ks2','refmodel.gain' ,'srcsrv',mdsserver,'srctree',mdstree,'shot',parshot));
+obj=obj.addparameter(SCDclass_mdsparnumeric('template.params.kv1','rowvect' ,'srcsrv',mdsserver,'srctree',mdstree,'shot',parshot));
+obj=obj.addparameter(SCDclass_mdsparnumeric('template.params.kv2','colvect' ,'srcsrv',mdsserver,'srctree',mdstree,'shot',parshot));
+obj=obj.addparameter(SCDclass_mdsparnumeric('template.params.km1','matrix' ,'srcsrv',mdsserver,'srctree',mdstree,'shot',parshot));
%% 2nd tunable parameters structure/parameters
-obj=obj.addtunparamstruct('algo_template_tp2', @()algo_template_loadtp(), false);
-obj=obj.addparameter(SCDclass_mdsparnumeric('kb1','enable' ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
+% obj=obj.addtunparamstruct('algo_template_tp2', @()algo_template_loadtp(), false);
+% obj=obj.addparameter(SCDclass_mdsparnumeric('template.params.kb1','enable' ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
%% Wavegens
obj=obj.addwavegenbasetruct('algo_template_inbus1');
-obj=obj.addwavegen(SCDclass_mdswgsigsingle( 'ai.ch001','signal1' ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
-obj=obj.addwavegen(SCDclass_mdswgsigsingle( 'ai.ch002','signal2' ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
+obj=obj.addwavegen(SCDclass_mdswgsigsingle( 'template.inputs.signal1','signal1' ,'srcsrv',mdsserver,'srctree',mdstree,'shot',parshot));
+obj=obj.addwavegen(SCDclass_mdswgsigsingle( 'template.inputs.signal2','signal2' ,'srcsrv',mdsserver,'srctree',mdstree,'shot',parshot));
%% 2nd wavegen base structure/signals
-obj=obj.addwavegenbasetruct('algo_template_inbus2');
-obj=obj.addwavegen(SCDclass_mdswgsigsingle( 'ai.ch003','signal1' ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
-obj=obj.addwavegen(SCDclass_mdswgsigsingle( 'ai.ch004','signal2' ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
+% obj=obj.addwavegenbasetruct('algo_template_inbus2');
+% obj=obj.addwavegen(SCDclass_mdswgsigsingle( 'ai.ch003','signal1' ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
+% obj=obj.addwavegen(SCDclass_mdswgsigsingle( 'ai.ch004','signal2' ,'srcsrv','spcpc171.epfl.ch','srctree','martetest','shot',parshot));
%% Buses
--
GitLab