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.

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

Added function to put datasheet values into database and updated enumerations #9

Merged
merged 10 commits into from
Feb 6, 2024

Conversation

sschachten
Copy link
Collaborator

  • added function write_datasheet_permeability_data_into_database.py to write datasheet data into database
  • added 3F46 as new material in json-file
    -- added permeability and permittivity datasheet values for 3F46
  • updated enumerations.py
    -- shifted enumerations from material-testbench to materialdatabase
    -- fixed minor problems with enumerations

Sebastian Schachten and others added 8 commits January 11, 2024 13:55
allows to write datasheet data into the database (NOT TESTED!!!)
put datasheet data for permeability of 3F46 in json-file
- removed string of datasheet path
- added some comments
- updated write_datasheet_permeability_data_into_database.py regarding upper function
@@ -153,6 +153,18 @@ def interpolate_a_b_c(a, b, c, no_interpolation_values=20):
return a_reduced, b_interpol_common, c_interpol_common


def interpolate_between_two_functions(x_data: list, y_data: list, x_new: list):
"""
interpolates y_new on base of x_new with the (x_data,y_data)-dataset
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where are the two functions?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one function is f(x_data) = y_data and the other (new) one is f(x_new) = y_new. the name of the function is irritating. i can change that. interpolate_between_two_graphs is probably a better name for the function.

@@ -1,22 +1,22 @@
from scipy import constants
from materialdatabase.utils import get_closest, Z_from_amplitude_and_angle
from materialdatabase.material_data_base_classes import *
from materialdatabase.paths import my_wayne_kerr_measurements_path
from materialdatabase.paths import your_sciebo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this module seems to be missing?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

your_sciebo is the path to the measurement data in the sciebo-folder. i can redo that change to my_wayne_kerr_measurements_path because its more generalized then

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wasn't able to find materialdatabase.paths this in my local pulled code. Seems like the whole module (py-file) is missing?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, we might have to find a workaround for that. The paths.py file is individually for every user, because it determines where the measurement files are located.
Sebastian, can you provide it in a way, that it contains the variable declarations but with None instead of the local paths?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, i can fix that.

sschachten and others added 2 commits January 19, 2024 12:00
changed name of function interpolate_between_two_functions to updates_x_ticks_for_graph
added a temporary solution for the paths.py
@gituser789 gituser789 merged commit 6b5c992 into main Feb 6, 2024
1 check passed
@sschachten sschachten deleted the datasheet_input branch October 23, 2024 09:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants