From 11a3f9d168b254f1f3387774f0ccd15bcc54accd Mon Sep 17 00:00:00 2001
From: Francesco Carpanese <francesco.carpanese@epfl.ch>
Date: Tue, 28 Jun 2016 07:06:37 +0000
Subject: [PATCH] .t changed in a vector instead of a matrix for matrix signals
(es Te)
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@6067 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/TCV/gdat_tcv.m | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/crpptbx/TCV/gdat_tcv.m b/crpptbx/TCV/gdat_tcv.m
index 14959039..0c95c25f 100644
--- a/crpptbx/TCV/gdat_tcv.m
+++ b/crpptbx/TCV/gdat_tcv.m
@@ -1548,7 +1548,6 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
indices = SDS_DS{ii}{jj}.(fieldnameslist{kk}).ind;
SDS_DS{ii}{jj}.(fieldnameslist{kk}).data = [];
- SDS_DS{ii}{jj}.(fieldnameslist{kk}).t = [];
for zz=1:numel(indices) %iter over indices
@@ -1566,13 +1565,16 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
if isnumeric(tmp.data)
SDS_DS{ii}{jj}.(fieldnameslist{kk}).data =[SDS_DS{ii}{jj}.(fieldnameslist{kk}).data; tmp.data'];
- SDS_DS{ii}{jj}.(fieldnameslist{kk}).t = [SDS_DS{ii}{jj}.(fieldnameslist{kk}).t; tmp.dim{1}'];
+ SDS_DS{ii}{jj}.(fieldnameslist{kk}).t = tmp.dim{1};
else
fprintf('Warning node: %d thread: %d signal: %s ind %d not available\n', ii,jj,fieldnameslist{kk}, zz );
end
end
+
+
+
end
end
@@ -1617,7 +1619,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
indices = SDS_AS{ii}{jj}.(fieldnameslist{kk}).ind;
SDS_AS{ii}{jj}.(fieldnameslist{kk}).data = [];
- SDS_AS{ii}{jj}.(fieldnameslist{kk}).t = [];
+
for zz=1:numel(indices) %iter over indices
ind = indices(zz);
@@ -1634,7 +1636,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
if isnumeric(tmp.data)
SDS_AS{ii}{jj}.(fieldnameslist{kk}).data =[SDS_AS{ii}{jj}.(fieldnameslist{kk}).data; tmp.data'];
- SDS_AS{ii}{jj}.(fieldnameslist{kk}).t = [SDS_AS{ii}{jj}.(fieldnameslist{kk}).t; tmp.dim{1}'];
+ SDS_AS{ii}{jj}.(fieldnameslist{kk}).t = tmp.dim{1};
else
fprintf('Warning node: %d thread: %d signal: %s ind %d not available\n', ii,jj,fieldnameslist{kk}, zz );
@@ -1689,7 +1691,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
indices = SDS_CS{ii}{jj}.(fieldnameslist{kk}).ind;
SDS_CS{ii}{jj}.(fieldnameslist{kk}).data = [];
- SDS_CS{ii}{jj}.(fieldnameslist{kk}).t = [];
+
for zz=1:numel(indices) %iter over indices
ind = indices(zz);
@@ -1706,7 +1708,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
if isnumeric(tmp.data)
SDS_CS{ii}{jj}.(fieldnameslist{kk}).data =[SDS_CS{ii}{jj}.(fieldnameslist{kk}).data; tmp.data'];
- SDS_CS{ii}{jj}.(fieldnameslist{kk}).t = [SDS_CS{ii}{jj}.(fieldnameslist{kk}).t; tmp.dim{1}'];
+ SDS_CS{ii}{jj}.(fieldnameslist{kk}).t = tmp.dim{1};
else
fprintf('Warning node: %d thread: %d signal: %s ind %d not available\n', ii,jj,fieldnameslist{kk}, zz );
--
GitLab