diff --git a/matlab/TCV_IMAS/ids2database.m b/matlab/TCV_IMAS/ids2database.m index 33c9e75249c5f16b3aa9185455ce994acd6e8d40..dd163847c2cc74a4c0d5347342e0feb30139a8f6 100644 --- a/matlab/TCV_IMAS/ids2database.m +++ b/matlab/TCV_IMAS/ids2database.m @@ -6,7 +6,7 @@ function [ids_put_status] = ids2database(shot,run,occurence,ids2put,tree_user,tr % from new ..._env routines, now user/publi database name, tokamak name and major UAL version (3 or 4 at this stage) need to be specified % tree_name: getenv('USER') by default, can be 'public' % tree_tokamak: 'tcv' by default -% tree_majorversion: '4' by default +% tree_majorversion: '3' by default % % varargin{1}: tbd % @@ -15,7 +15,7 @@ ids_put_status = 0; tree_user_default = getenv('USER'); tree_tokamak_default = 'tcv'; -tree_majorversion_default = '4'; +tree_majorversion_default = '3'; % initialize input parser p = inputParser; diff --git a/matlab/TCV_IMAS/tcv2ids2database.m b/matlab/TCV_IMAS/tcv2ids2database.m index 6bd2d3c363dabeec079b6209078b5fcf33a4b7c4..56191700b26f000722037c0c3c2e7b6227ea73f6 100644 --- a/matlab/TCV_IMAS/tcv2ids2database.m +++ b/matlab/TCV_IMAS/tcv2ids2database.m @@ -16,7 +16,7 @@ function [ids_from_tcv,varargout] = tcv2ids2database(shot,run_out,varargin); % 'delta_with_lower': as 'delta' but lower also set % 'tree_user': getenv('USER') by default, user for database (could be 'public') % 'tree_tokamak': tokamak name, default ('tcv') -% 'tree_majorversion': default '4' +% 'tree_majorversion': default '3' % 'cocos_out': (default 11) cocos to transform ids from TCV cocos_in=17 to cocos_out % 'ipsign_out': if a specific sign fo Ip is desired in output within the cocos_out system (default 0=no specific sign) % 'b0sign_out': if a specific sign fo B0 is desired in output within the cocos_out system (default 0=no specific sign) @@ -49,7 +49,7 @@ p.addOptional('ids_names', {'equilibrium', 'magnetics', 'pf_active','wall', 'tf' p.addOptional('error_bar', 'delta', @(x) isempty(x) || ischar(x) ); % char or cell array p.addOptional('tree_user', getenv('USER'), @(x) isempty(x) || ischar(x) ); % char p.addOptional('tree_tokamak', 'tcv', @(x) isempty(x) || ischar(x) ); % char -p.addOptional('tree_majorversion', '4', @(x) isempty(x) || ischar(x) ); % char +p.addOptional('tree_majorversion', '3', @(x) isempty(x) || ischar(x) ); % char p.addOptional('cocos_out', 11, @(x) isempty(x) || isnumeric(x) ); % char p.addOptional('ipsign_out', 0, @(x) isempty(x) || (x==0 | x==-1 | x==+1) ); % char p.addOptional('b0sign_out', 0, @(x) isempty(x) || (x==0 | x==-1 | x==+1) ); % char diff --git a/matlab/TCV_IMAS/tcv_get_ids_ec_antennas.m b/matlab/TCV_IMAS/tcv_get_ids_ec_antennas.m index 261619c717363b15530a7c112a681495f18925e8..8203da416158472b12799698989ac8aa0b31a18b 100644 --- a/matlab/TCV_IMAS/tcv_get_ids_ec_antennas.m +++ b/matlab/TCV_IMAS/tcv_get_ids_ec_antennas.m @@ -78,13 +78,13 @@ for iant=1:nb_antennas ids_ec_antennas.antenna{iant}.launching_angle_pol.time(i) = time_launch; ids_ec_antennas.antenna{iant}.launching_angle_tor.data(i) = launch_params{iant}{it_ok{iant}(i)}.phi_toray * pi/180.; ids_ec_antennas.antenna{iant}.launching_angle_tor.time(i) = time_launch; - ids_ec_antennas.antenna{iant}.beam.spot.size.data(i,1:2) = 0.05; + ids_ec_antennas.antenna{iant}.beam.spot.size.data(i,1:2) = 0.05.*ones(size(time_launch)); ids_ec_antennas.antenna{iant}.beam.spot.size.time(i) = time_launch; - ids_ec_antennas.antenna{iant}.beam.spot.angle.data(i,1:2) = 0.0; + ids_ec_antennas.antenna{iant}.beam.spot.angle.data(i,1:2) = 0.0.*ones(size(time_launch)); ids_ec_antennas.antenna{iant}.beam.spot.angle.time(i) = time_launch; - ids_ec_antennas.antenna{iant}.beam.phase.angle.data(i,1:2) = 0.0; + ids_ec_antennas.antenna{iant}.beam.phase.angle.data(i,1:2) = 0.0.*ones(size(time_launch)); ids_ec_antennas.antenna{iant}.beam.phase.angle.time(i) = time_launch; - ids_ec_antennas.antenna{iant}.beam.phase.curvature.data(i,1:2) = 1.0; + ids_ec_antennas.antenna{iant}.beam.phase.curvature.data(i,1:2) = 1.0.*ones(size(time_launch)); ids_ec_antennas.antenna{iant}.beam.phase.curvature.time(i) = time_launch; end end