From 4cf776bb9b655f9711d2438347bd79afafe9c3a9 Mon Sep 17 00:00:00 2001
From: Federico Felici <federico.felici@epfl.ch>
Date: Wed, 29 May 2019 09:39:54 +0200
Subject: [PATCH] Corrected + improved MARTe2 config writer
+ some cosmetics
---
code/classes/SCDclass_mdsobjcontainer.m | 24 +++++++++-------------
code/classes/SCDclass_mdspar.m | 7 +------
code/classes/SCDclass_mdsparscalartaridx.m | 4 +---
code/classes/SCDclass_mdsparvector.m | 3 +--
code/classes/SCDclass_mdswgsigsingle.m | 3 +--
5 files changed, 14 insertions(+), 27 deletions(-)
diff --git a/code/classes/SCDclass_mdsobjcontainer.m b/code/classes/SCDclass_mdsobjcontainer.m
index f9d9fed..ee77709 100644
--- a/code/classes/SCDclass_mdsobjcontainer.m
+++ b/code/classes/SCDclass_mdsobjcontainer.m
@@ -240,7 +240,7 @@ classdef SCDclass_mdsobjcontainer
end
end
end
-
+
end
function printMARTe2parconfig(obj, shot)
@@ -260,7 +260,7 @@ classdef SCDclass_mdsobjcontainer
% generate header for MDSsource if necessary
if ~strcmp(currentServer,prevServer) %if a new server needs to be opened
- if ii~=1, fprintf(' }\n'), end
+ if ii~=1, fprintf(' }\n'), end % close bracket for previous one
% print new source header
fprintf("%s\n",mymdsparam.genMARTe2MDSsourcestr);
end
@@ -270,7 +270,7 @@ classdef SCDclass_mdsobjcontainer
str = mymdsparam.genMARTe2entry(shot);
fprintf(" %s\n",str);
end
- fprintf("}\n\n");
+ fprintf(" }\n}\n\n");
otherwise
for ii=1:obj.numparams
@@ -282,7 +282,6 @@ classdef SCDclass_mdsobjcontainer
end
end
-
function iorder = getParamsServerTreeOrder(obj)
% find server-tree order of parameters
mdsservertree = cell(numel(obj.mdsparams),2);
@@ -293,21 +292,18 @@ classdef SCDclass_mdsobjcontainer
[~,iorder] = sortrows(mdsservertree);
end
-
function printMARTe2wgconfig(obj, shot)
for ii=1:obj.numwavegens
if(strcmp(obj.modeltogenerate,'all'))
str=obj.mdswavegens(ii).genMARTe2entry(shot);
fprintf(" %s\n",str);
- else
- if(strcmp(obj.modeltogenerate,obj.mdswavegens(ii).getmodelname))
- str=obj.mdswavegens(ii).genMARTe2entry(shot);
- fprintf(" %s\n",str);
- end
- end
- end
+ else
+ if(strcmp(obj.modeltogenerate,obj.mdswavegens(ii).getmodelname))
+ str=obj.mdswavegens(ii).genMARTe2entry(shot);
+ fprintf(" %s\n",str);
+ end
+ end
+ end
end
-
-
end
end
diff --git a/code/classes/SCDclass_mdspar.m b/code/classes/SCDclass_mdspar.m
index f7b27e2..1551773 100644
--- a/code/classes/SCDclass_mdspar.m
+++ b/code/classes/SCDclass_mdspar.m
@@ -169,7 +169,6 @@ classdef SCDclass_mdspar < matlab.mixin.Heterogeneous
if(isempty(obj.modelname))
obj.modelname = modelname;
end
-
end
function obj = setdatadictionary(obj, ddname)
@@ -179,12 +178,8 @@ classdef SCDclass_mdspar < matlab.mixin.Heterogeneous
end
function entrystring = genMARTe2entrycommon(obj, shot)
- %obj.mdsconnect(shot);
- %[obj,~]=obj.getdata(shot);
obj=obj.actualizetdiexpr(shot);
- %entrystring = ['+' obj.modeltargetpar ' = { Class=' obj.classname ' Path=' obj.tdiexprused ' }'];
-% entrystring = ['+' obj.modeltargetpar ' = { Class=' obj.classname ' Path=' obj.tdiexprused ' Server=' obj.mdsserver, ' Tree=' obj.mdstree];
- entrystring = sprintf('+%-25s = { Class=%-30s Path=%-35s Server=%-25s Tree=%-25s',obj.modeltargetpar,obj.classname,obj.tdiexprused,obj.mdsserver,obj.mdstree);
+ entrystring = sprintf('+%-30s = { Class=%-30s Path=%-40s',obj.gettargetparam,obj.classname,obj.tdiexprused);
end
function str = genMARTe2MDSsourcestr(obj)
diff --git a/code/classes/SCDclass_mdsparscalartaridx.m b/code/classes/SCDclass_mdsparscalartaridx.m
index a6cea86..e67b8d5 100644
--- a/code/classes/SCDclass_mdsparscalartaridx.m
+++ b/code/classes/SCDclass_mdsparscalartaridx.m
@@ -35,11 +35,9 @@ classdef SCDclass_mdsparscalartaridx < SCDclass_mdspar
end
function entrystring = genMARTe2entry(obj, shot)
- entrystring=obj.genMARTe2entrycommon(shot);
- entrystring=[entrystring ' Idx=' num2str(obj.targetidx) ' }'];
+ entrystring =sprintf('%s Idx=%d}',obj.genMARTe2entrycommon(shot),obj.targetidx);
end
-
end
end
diff --git a/code/classes/SCDclass_mdsparvector.m b/code/classes/SCDclass_mdsparvector.m
index c0f6f70..e99b276 100644
--- a/code/classes/SCDclass_mdsparvector.m
+++ b/code/classes/SCDclass_mdsparvector.m
@@ -30,8 +30,7 @@ classdef SCDclass_mdsparvector < SCDclass_mdspar
end
function entrystring = genMARTe2entry(obj, shot)
- entrystring=obj.genMARTe2entrycommon(shot);
- entrystring=[entrystring ' }'];
+ entrystring=[obj.genMARTe2entrycommon(shot) ' }'];
end
end
diff --git a/code/classes/SCDclass_mdswgsigsingle.m b/code/classes/SCDclass_mdswgsigsingle.m
index b9c018a..dd50710 100644
--- a/code/classes/SCDclass_mdswgsigsingle.m
+++ b/code/classes/SCDclass_mdswgsigsingle.m
@@ -115,8 +115,7 @@ classdef SCDclass_mdswgsigsingle < SCDclass_mdswg
end
function entrystring = genMARTe2entry(obj, shot)
- entrystring=obj.genMARTe2entrycommon(shot);
- entrystring=[entrystring ' }'];
+ entrystring=[obj.genMARTe2entrycommon(shot) ' }'];
end
end
--
GitLab