Skip to content
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

Jump to bottom

Variant Import #284

Merged
merged 13 commits into from
Mar 5, 2019
Merged

Variant Import #284

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
79f79da
Variant document generator
landswellsong Aug 22, 2017
29eed69
Varian'ts telemetry
landswellsong Aug 22, 2017
01b626c
Variant session timing
landswellsong Aug 22, 2017
efec426
Parameter is now also added
landswellsong Aug 22, 2017
0c44896
Dumbing down to one component
landswellsong Aug 23, 2017
b0b11e6
Make sure we capture the last session
landswellsong Aug 23, 2017
2454d1d
Altitude re-enabled
landswellsong Aug 21, 2017
735ae3b
Improved data reading for Variant project, session 1394
gloriajjl Nov 16, 2018
49da1f1
Added more devices/channels/parameters to Variant project
gloriajjl Dec 5, 2018
83503b6
Added reading of the rest of the Variant sessions + reading more chan…
gloriajjl Dec 23, 2018
8ca4eb3
Some minor fixes
gloriajjl Jan 2, 2019
1d92612
post-review fixes
gloriajjl Feb 18, 2019
39228d4
Minor changes (deleted some comments, removed camelcase etc.)
gloriajjl Mar 3, 2019
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
2 changes: 2 additions & 0 deletions backend/promis/classes/base_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ def avg_float(l, n, span):
return s / span

v = self.data(selection)
if len(v) > 0 and type(v) is list and len(v[0]) == 1:
v = [x[0] for x in v]
gloriajjl marked this conversation as resolved.
Show resolved Hide resolved

# If given too much points, return the original data
# TODO: make configurable somewhere
Expand Down
6 changes: 4 additions & 2 deletions backend/promis/classes/variant.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ def fetch(self, daydir):
for line in fp:
if idx >= len(component_sf):
break
if daydir in ["1057", "1071", "1109", "1278", "1394"] and idx == 3:
idx += 2
if len(line.rstrip()) != 0:
component_sf[idx][1] = float(line)
idx += 1
Expand Down Expand Up @@ -205,7 +207,7 @@ def find_sf(components):
if name == comp_name:
max_sf = max(max_sf, sf)
break
#print("components: " + str(components) + " sf: " + str(max_sf))
#print("components: " + str(components) + " max_sf: " + str(max_sf))
return max_sf

sampling_frequency = find_sf(chan_files['comps'])
Expand All @@ -219,4 +221,4 @@ def catchIdxError(component, idx):

json_data = [tuple([catchIdxError(component,idx) for component in listOfComponents]) for idx in range(numValues)]
doc_obj = model.Document.objects.create(json_data = json_data )
meas = model.Measurement.objects.create(session = sess_obj, parameter = par_obj, channel = chan_obj, channel_doc = doc_obj, parameter_doc = doc_obj, sampling_frequency = sampling_frequency, max_frequency = 31250, min_frequency = 31250)
meas = model.Measurement.objects.create(session = sess_obj, parameter = par_obj, channel = chan_obj, channel_doc = doc_obj, parameter_doc = doc_obj, sampling_frequency = sampling_frequency, max_frequency = sampling_frequency, min_frequency = sampling_frequency)