From 2769b0158bd68b766aaee78c31c135871e458033 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Wed, 30 Mar 2016 10:04:41 +0000
Subject: [PATCH] avoid asking for key generation perimission since hangs the
gdat command waiting for 'yes'
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@5599 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/AUG/CEZ_CMZ_fit.m | 6 +++++-
crpptbx/AUG/gdat_aug.m | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/crpptbx/AUG/CEZ_CMZ_fit.m b/crpptbx/AUG/CEZ_CMZ_fit.m
index ace671e8..69e4ec5c 100644
--- a/crpptbx/AUG/CEZ_CMZ_fit.m
+++ b/crpptbx/AUG/CEZ_CMZ_fit.m
@@ -73,6 +73,9 @@ else
tension_vrot_eff=-3;
end
+tifit = [];
+dtifitdrn = [];
+
doplot=0;
for i=1:length(ij)
it_cxrs = find(cxrs.t>=t1(i) & cxrs.t<t2(i));
@@ -115,7 +118,8 @@ for i=1:length(ij)
[rhoeff,irhoeff] = sort(rhotor_data_tofit);
tidata_tofit_eff = tidata_tofit(irhoeff);
if isempty(tidata_tofit_eff)
- keyboard
+ disp('tidata_tofit_eff empty')
+ return
else
vrotdata_tofit_eff = vrotdata_tofit(irhoeff);
tierr_tofit_eff = tierr_tofit(irhoeff);
diff --git a/crpptbx/AUG/gdat_aug.m b/crpptbx/AUG/gdat_aug.m
index 708413db..891ab6f4 100644
--- a/crpptbx/AUG/gdat_aug.m
+++ b/crpptbx/AUG/gdat_aug.m
@@ -1839,7 +1839,7 @@ elseif strcmp(mapping_for_aug.method,'switchcase')
if ~isfield(gdat_data.gdat_params,'time_interval')
gdat_data.gdat_params.time_interval = [];
end
- [aa,bb]=unix(['ssh ' 'sxaug20.aug.ipp.mpg.de WhichSX ' num2str(shot) ' ' ...
+ [aa,bb]=unix(['ssh ' '-o "StrictHostKeyChecking no" sxaug20.aug.ipp.mpg.de WhichSX ' num2str(shot) ' ' ...
upper(gdat_data.gdat_params.source)]);
chords_ok_diags=regexpi(bb,'(?<chord>[A-Z]_[0-9]+)\saddress:\s[0-9]+\sDiag:\s(?<diag>[A-Z]+)','names');
if isempty(chords_ok_diags)
--
GitLab