Skip to content

Update PITtrack2.m #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
macvicab wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Update PITtrack2.m #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d403df
Update PITtrack2.m
macvicab Jun 30, 2022
fbd4ae2
Update PITtrack_default.m
macvicab Jul 21, 2022
766da9f
Update PITtrack_default.m
macvicab Jul 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions PITtrack2.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,11 @@ function PITtrack2(site,C)
placedData(nf).Sdist = Sdist;
placedData(nf).Ndist = Ndist;
end
elseif ~isfield(placedData,'Ndist')
for nf = 1:nftot
placedData(nf).Ndist = NaN;
end
end

% use taglist to cut labData to only the requested particles
if ~isempty(taglist)
% shorten the labdata to only the requested tags
Expand Down Expand Up @@ -237,4 +240,4 @@ function PITtrack2(site,C)
eval([datee,' = data(:,',num2str(n),');']);
evalstr = [evalstr,',',datee];
end
eval(['T = table(',evalstr,');']);
eval(['T = table(',evalstr,');']);
18 changes: 6 additions & 12 deletions PITtrack_default.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,10 @@
% site 2 = Ganny = 0; % Wilket Creek (Papangelakis et al 2019)

if site == 1
% for Bradley
def_data.D50 = 55; % mm
def_data.szcat = 2.^[5:1:6];
def_data.fdir = 'F:\Research\Publications\In Preparation\2020 Elli Nature Geoscience\Bradley 2017 data\tagged\';
def_data.fchar = 'Tag Characteristics Halfmoon.csv';
elseif site == 2
def_data.D50 = 37; % mm
def_data.szcat = 2.^[5:1:8];
def_data.fdir = 'F:\Research\Publications\In Preparation\2020 Elli Nature Geoscience\Elli Thesis Data\Ganny\';
def_data.fchar = 'Tag Characteristics 2.csv';
def_data.thalname = 'GCrk_Thalweg_rev.csv';
def_data.taglist = 'DS_Ganny_tagnum.csv';
end
def_data.szcat = 2.^[5:1:8]; % size categories in -phi values (log base 2 classification system)
def_data.fdir = 'Ganatsekaigon\'; % directory path
def_data.fchar = 'Tag Characteristics 2.csv'; % name of file that contains tracer characteristics such as sizes
def_data.thalname = 'GCrk_Thalweg_rev.csv'; % name of file that has the thalweg data
def_data.taglist = 'DS_Ganny_tagnum.csv'; % list of tag numbers to include in analysis (may be a subset of all tags in river)
end