From 85a0b9c00d93cc4879f1c0d0055e6d638ef17e9d Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Mon, 8 May 2017 20:56:12 +0000
Subject: [PATCH] add tunnel connection to local:host
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@7305 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/D3D/gdat_d3d.m | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/crpptbx/D3D/gdat_d3d.m b/crpptbx/D3D/gdat_d3d.m
index 15bd5c09..785563bd 100644
--- a/crpptbx/D3D/gdat_d3d.m
+++ b/crpptbx/D3D/gdat_d3d.m
@@ -256,9 +256,22 @@ if strcmp(mapping_for_d3d.method,'signal')
else
mapping_for_d3d.expression{1} = gdat_data.gdat_params.source;
end
- gdat_data.gdat_params.source = mapping_for_d3d.expression{1};
- [shoteff,stat] = mdsopen(['atlas.gat.com::' mapping_for_d3d.expression{1}],shot);
- if shoteff~=shot
+ shoteff = [];
+ aa=mdscurrent;
+ if ~isempty(shot)
+ if isempty(aa) && mdsremotelist==0 && any(findstr('epfl',getenv('HOSTNAME')))
+ mdsconnect('localhost:5556');
+ aa=mdscurrent;
+ end
+ if strmatch('localhost',aa)
+ [shoteff,stat] = mdsopen(mapping_for_d3d.expression{1},shot);
+ else
+ [shoteff,stat] = mdsopen(['atlas.gat.com::' mapping_for_d3d.expression{1}],shot);
+ end
+ else
+ shot = mdsvalue('$shot');
+ end
+ if ~isempty(shoteff) && shoteff~=shot
disp('cannot open shot');
return
end
--
GitLab