Commit c12a5b3b authored by Dany Dumont's avatar Dany Dumont

mise a jour de tr_sort sur mingan

parents f6e4d1a4 34a1af0f
This diff is collapsed.
This diff is collapsed.
......@@ -21,12 +21,22 @@ function tr_sort(num_spot,mission,debut,h1,fin,h2)
% Enregistrements sous forme de structure sur Brandypot:
% sas/usagers/share_lasso/data/MEOPAR/drifter
<<<<<<< HEAD
%rootdir = '/sas/usagers/share_lasso/data/MEOPAR';
rootdir = '/share/archives/partage_lasso/spot';
fid1 = fopen([ rootdir '/spots_pos_flag_clean.csv']);
header = textscan(fid1,'%s;%s;%s;%s;%s;%s',1);
spot_clean = textscan(fid1,'%f %f %f %f %s %s','Delimiter',';');
=======
rootdir = '/sas/usagers/share_lasso/data/MEOPAR';
rootdir = '/share/archives/partage_lasso/spot';
datafile = 'spots_pos_flag_clean.csv';
fid1 = fopen([rootdir,'/',datafile]);
spot_clean = textscan(fid1,'%f %f %f %f %s', 'delimiter',';');
>>>>>>> 34a1af0f18cd70ac52566c710fb2c8abde1cb78e
fclose(fid1);
spot = spot_clean{1,1};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment