From 3211b347971e89a2265904e167e60a4b929ee4c2 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Mon, 21 Jan 2002 10:41:02 +0000
Subject: [PATCH] multiple uid for efit, chain2, etc
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@1858 d63d8f72-b253-0410-a779-e742ad2e26cf
---
JET/geteqdskJET.m | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/JET/geteqdskJET.m b/JET/geteqdskJET.m
index 14d5d4d5..fa5398aa 100644
--- a/JET/geteqdskJET.m
+++ b/JET/geteqdskJET.m
@@ -60,8 +60,8 @@ else
uid=uid0;
end
if nargin>=9 & ~isempty(seqd)
- for i=length(uid)+1:length(uid0)
- seqd(i)=seqd(i);
+ for i=length(seqd)+1:length(seqd0)
+ seqd(i)=seqd0(i);
end
else
seqd=seqd0;
@@ -168,7 +168,7 @@ if index_efit<=length(efitdata.bttm.data); bttm=efitdata.bttm.data(index_efit);
if index_efit<=length(efitdata.btnm.data); btnm=efitdata.btnm.data(index_efit); else; btnm=0; end
xli=efitdata.xli.data(index_efit);
-[R,Z,psinrz]=psirz(shot,time,nrg,nzg,efitlab,uid,seqd,ncont,efitdata.sspr,efitdata.sspi,deltaz);
+[R,Z,psinrz]=psirz(shot,time,nrg,nzg,efitlab,uid{iexefit},seqd(iexefit),ncont,efitdata.sspr,efitdata.sspi,deltaz);
nzg=abs(nzg);
% define file name
@@ -178,7 +178,7 @@ fid=fopen(fname,'w');
% 1st eqdsk line: 48 characters for file description and then, 3, nr, nz
tdate=date;
-ss=['JET #' num2str(shot) ' t= ' num2str(time_efit) ' ' efitlab '?uid=' uid '+seq=' num2str(seqd) ', ' tdate];
+ss=['JET #' num2str(shot) ' t= ' num2str(time_efit) ' ' efitlab '?uid=' uid{iexefit} '+seq=' num2str(seqd(iexefit)) ', ' tdate];
if length(ss)<48
ss(end:48)=' ';
else
@@ -276,8 +276,8 @@ fprintf(fid,'%18.8e li\n',xli);
fprintf(fid,'\n%18.8e time\n',time);
fprintf(fid,' %d shot number\n',shot);
fprintf(fid,' efit version : %s\n',efitlab);
-fprintf(fid,' uid : %s\n',uid);
-fprintf(fid,' seq : %d\n',seqd);
+fprintf(fid,' uid : %s, %s, %s\n',uid{1},uid{2},uid{3});
+fprintf(fid,' seq : %d, %d, %d\n',seqd(1:3));
fclose(fid);
disp(['wrote ',fname]);
--
GitLab