From 7995df33857180bb82580a17dd7540b6eb7feb11 Mon Sep 17 00:00:00 2001
From: galperti <cristian.galperti@epfl.ch>
Date: Wed, 3 Jun 2020 17:22:47 +0200
Subject: [PATCH] some fixes for the merge request
---
code/classes/SCDclass_mdspar.m | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/code/classes/SCDclass_mdspar.m b/code/classes/SCDclass_mdspar.m
index bcf283a..e780026 100644
--- a/code/classes/SCDclass_mdspar.m
+++ b/code/classes/SCDclass_mdspar.m
@@ -36,7 +36,7 @@ classdef SCDclass_mdspar < matlab.mixin.Heterogeneous
unlinked % unlinked parameter, no actualization will be performed (this is set via an empty MDS source path)
actualizable % true if after MDS data retrieval phase the parameter is actualizable
- overrideshot % =1 if biult with overridden whot number in this case this shot number will be always used during actualization
+ overrideshot % =1 if instantiated with overridden shot number, in this case this shot number will be always used during actualization
overrideshotn % shot number in case of overridden shot number
end
@@ -107,6 +107,10 @@ classdef SCDclass_mdspar < matlab.mixin.Heterogeneous
assert(~~exist('mdsconnect','file'),...
'SCD:NoMDS','mdsconnect not found, are the mds matlab tools installed?')
mdsconnect(obj.mdsserver);
+ % If the class has been declared with a 'shot' parameter, then
+ % the shotnumber used for param loading is overridden by this
+ % parameter, otherwise it is taken from the global shot number
+ % given to the actualize command
if obj.overrideshot == 1
localshot = obj.overrideshotn;
else
--
GitLab