Commit 341c423b authored by Michael Rudolf's avatar Michael Rudolf
Browse files

Fixed package visibility problems.

parent 5e4d4236
...@@ -5,11 +5,10 @@ import os ...@@ -5,11 +5,10 @@ import os
import subprocess import subprocess
import sys import sys
import rstevaluation.tools.analysis as rstanalysis from . import analysis as rstanalysis
import rstevaluation.tools.data as rstdata from . import files as rstfiles
import rstevaluation.tools.files as rstfiles from . import picking as rstpicking
import rstevaluation.tools.picking as rstpicking from . import plots as rstplots
import rstevaluation.tools.plots as rstplots
def evaluate(config): def evaluate(config):
...@@ -44,7 +43,8 @@ def evaluate(config): ...@@ -44,7 +43,8 @@ def evaluate(config):
else: else:
print('Automatic analysis skipped, initiating manual picking') print('Automatic analysis skipped, initiating manual picking')
eval_data = [ eval_data = [
rstpicking.eval_shearstress(cur_dat, config, review='manual') rstpicking.eval_shearstress(
cur_dat, config, review='manual')
for cur_dat in exp_data for cur_dat in exp_data
] ]
evaluate_data(eval_data, exp_data, config) evaluate_data(eval_data, exp_data, config)
...@@ -65,7 +65,7 @@ def get_data(config): ...@@ -65,7 +65,7 @@ def get_data(config):
has_tdms = True has_tdms = True
# Check which tdms files are too long and downsample if necessary # Check which tdms files are too long and downsample if necessary
if has_tdms: if has_tdms:
rstdata.check_tdms(file_list, config) rstfiles.check_tdms(file_list, config)
# Data is stored as a list of dictionaries containing the data # Data is stored as a list of dictionaries containing the data
exp_data = [ exp_data = [
......
...@@ -7,7 +7,9 @@ summary = Package to work with ring shear tester data from the Helmholtz Laborat ...@@ -7,7 +7,9 @@ summary = Package to work with ring shear tester data from the Helmholtz Laborat
home-page = https://git.gfz-potsdam.de/analab-code/rst-evaluation home-page = https://git.gfz-potsdam.de/analab-code/rst-evaluation
[options] [options]
packages = find: package_dir =
= rstevaluation
packages = find_namespace:
install_requires = install_requires =
h5py h5py
matplotlib matplotlib
...@@ -19,7 +21,7 @@ install_requires = ...@@ -19,7 +21,7 @@ install_requires =
include_package_data = True include_package_data = True
[options.packages.find] [options.packages.find]
include = rstevaluation where = rstevaluation
exclude = Legacy exclude = Legacy
[options.entry_points] [options.entry_points]
......
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