Commit ca0a5c97 authored by Achim Morschhauser's avatar Achim Morschhauser
Browse files

folders restructured

parent c69aeafd
......@@ -25,50 +25,32 @@
% Required:
% =========
%
% - starttime used as input for jd2000 starttime
% - station character vector station name
%
% - stoptime used as imput for jd2000 stoptime
%
% - station character vector station name
% - startdate input for jd2000 startdate
%
% Optional:
% =========
%
% - produce_IAGA_2002_min '0' (default) no output
% 'P' provisional data
% 'D' definitive data
% 'Q' quasi-definitive data
% 'V' variation (V)
%
% - produce_IAGA_2002_sec '0' (default) no output
% 'P' provisional data
% 'D' definitive data
% 'Q' quasi-definitive data
% 'V' variation (V)
%
% - calculate_IAGA_F 'n' (default) 888888 is set in the F-column for
% types Q, D, P, V
% 'y' for type other than V), then F is
% calculated from XYZ
%
% - output_format 'c' (default) means calibrated, all types of files
% 'r' means raw, only raw-file 1 second
% and IAGA V
% - parfile character Parameter file
% vector (Default: parameters_win.txt)
%
% - output_ftp 'n' (default) raw one second data saved as cdf
% 'y' raw one second data saved as ftp
% REQUIRES
% - output_format = 'r'
% - output_resolution = 's'
% - produce_IAGA_2002_min = '0'
% - stopdate input for jd2000 stopdate
% default: today
%
% - output_resolution '0' (default) don't write mat-file
% 's' means that also 1-second values are
% saved in matlab format.
% - number_DI integer number of DI measurements to
% be read:
% 0 (default): all in time
% specified by
% start/stopdate
% else: number of meas.
% before stopdate
%
% - time_interval 'n' (default) specified by startdate and enddate
% 'r' means real time from magobs/magdata
% - tempsource 'c' (default) Temperature from cdf-file
% 's' Temperature from spreadsheet
%
% - temp_correct 'y' (default) Apply temperature correction
%
% read in all DI-measurements for this year
%number_DI = 5; % read in the last x measurements in this year
%number_DI = 0; % use date range from below
......@@ -116,7 +98,6 @@ if ~exist(arg_parsed.parfile,'file')
end
% Set default values from parameter file
[arg_specs.path.default, ...
arg_specs.station.default, ...
......@@ -146,20 +127,26 @@ arg_specs.station.type='char';
arg_specs.station.dim1=1;
arg_specs.station.dim2=5;
arg_specs.startdate.required=1;
arg_specs.startdate.type='char';
arg_specs.startdate.dim1=1;
arg_specs.startdate.dim2=10;
% Number of DI measurements to be read for given year
arg_specs.number_DI.required=1;
arg_specs.number_DI.type = 'numeric';
arg_specs.number_DI.dim1 = 1;
arg_specs.number_DI.dim2 = 1;
arg_specs.startdate.required=1;
arg_specs.startdate.type='char';
arg_specs.startdate.dim1=1;
arg_specs.startdate.dim2=10;
%
% Specify optional arguments
% Stopdate
arg_specs.stopdate.default=arg_specs.startdate.default;
arg_specs.stopdate.type='char';
arg_specs.stopdate.dim1=1;
arg_specs.stopdate.dim2=10;
% Source for temperature readings
% 'c' for cdf
arg_specs.tempsource.default='c';
......@@ -173,17 +160,12 @@ arg_specs.temp_correct.valid={'y','n'};
arg_specs.apply_time_lag.default='y';
arg_specs.apply_time_lag.valid={'y'};
%
% Find time error
arg_specs.find_time_error.default='n';
%
% Timeshift array
arg_specs.timeshift_array.default=[-300:1:300]';
arg_specs.stopdate.default=arg_specs.startdate.default;
arg_specs.stopdate.type='char';
arg_specs.stopdate.dim1=1;
arg_specs.stopdate.dim2=10;
% -------------------------------------------------------------------------
% Parse arguments from command-line
% -------------------------------------------------------------------------
......@@ -220,9 +202,7 @@ end
% -------------------------------------------------------------------------
% This was removed as option here !
%
% 's' for spreadsheet, 'c' for cdf, here always 'c'
% If 's' is to be used, then change this in calculate_baselines.m
ppmsource = 'c';
......@@ -253,24 +233,10 @@ return_array = []; %returnes baseliens etc from function
bs=backslash;
% Is this still needed?
% path_DI = [path1 bs 'BPDATA' bs 'DI_' station(1:3) ...
% num2str(year, '%4.4d') bs];
% if strcmp(station(1:3), 'MSN')
% path_DI = [path1 bs 'BPDATA' bs 'DI_' 'NGK' ...
% num2str(year, '%4.4d') bs];
% end %MSN
%
% path_cdf = [path1 bs 'laptop_data' bs station(1:4) bs 'cdf' bs];
%if strcmp(pwd, 'O:\jmat\0programme_win')
path_DI = [path1 bs '0DI_measurements' bs 'DI_' station(1:3) ...
num2str(year, '%4.4d') bs];
path_cdf = [path1 bs station(1:4) bs 'cdf' bs];
%end
%month = 1; removed 27/2-2012
%day = 7;
% =========================================================================
% START PROCESSING
......
function [ return_string ] = ...
calculate_baselines( DI_file, cdf_file, station, ppmsource,...
calculate_baselines(DI_file, cdf_file, station, ppmsource,...
tempsource,temp_correct, apply_time_lag )
%UNTITLED Summary of this function goes here
% Detailed explanation goes here
......@@ -1160,7 +1160,7 @@ if exist(DI_file, 'file') == 2;
% Hauptpfeiler in Neuwingst
elseif pillar_nr == 8 % NUR FR TESTBETRIEB IN NIEMEGK
elseif pillar_nr == 8 % NUR FR TESTBETRIEB IN NIEMEGK
% Niemegk Hauptpfeiler
display('niemegk sockel 8')
deltaI = 0.0000 + 0.0000;
......@@ -1761,7 +1761,7 @@ end
code(1:2) = '43'
elseif strcmp(upper(operator), 'JC')%Jorge Cruz 2018 SMA
code(1:2) = '44'
elseif strcmp(upper(operator), 'AND')%Horcio Andr 2018 SMA
elseif strcmp(upper(operator), 'AND')%Horcio Andr 2018 SMA
code(1:2) = '45'
end
%Danieal Armbruster vna 2014
......@@ -1918,7 +1918,7 @@ end
H10 = 18160;
Z10 = 46100;
end
if strcmp(station(1:4), 'WNG5') % testsystem fr WNG NEU
if strcmp(station(1:4), 'WNG5') % testsystem fr WNG NEU
H10 = 18868.09;
Z10 = 45418.48;
end
......
Supports Markdown
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