diff --git a/README.md b/README.md index 71f78e1..2135972 100644 --- a/README.md +++ b/README.md @@ -27,10 +27,10 @@ You are currently reading `README.md`, where the structure of this oroject is ex 1. `.git` contains all files related to `git`. These files are usually not interesting, unless you need to go back to old commits or want to know more details. Best leave this alone. For a detailed description of how `git` (and with it the `.git` directory) works, see [`git` description](##Git). 2. `.vscode` contains all files relevant for environment setup to run this project in [Visual Studio Code](https://code.visualstudio.com/). These files are: 1. `settings.json`: the setup file to set up VS Code in the desired configuration. Feel free to change these as you like. For example, the setting `"python.defaultInterpreterPath": "C:/Users/tschan_d/AppData/Local/miniforge3/envs/MA/python"` needs to be changed to point to the path of the Python interpreter you select. - 2. `launch.json`: the launch configuration file for the project, in which it is specified how VSCode should behave when you launch a job: that is, when you want to run a file or debug it. Again, feel free to customise these settings. -Important here is that + 2. `launch.json`: the launch configuration file for the project, in which it is specified how VSCode should behave when you launch a job: that is, when you want to run a file or debug it. Again, feel free to customise these settings. 3. `defs` contains source code for data analysis: 1. `__init__.py` is a file to structure the project like a package. This file is empty, but it is needed such that relative imports work properly. + 2. `defs.py` is the file defining classed and methods used to analyse data. 4. `vis` contains source code for data visualisation. # Coding help diff --git a/defs/defs.py b/defs/computing.py similarity index 100% rename from defs/defs.py rename to defs/computing.py diff --git a/vis/__init__.py b/defs/visualising.py similarity index 100% rename from vis/__init__.py rename to defs/visualising.py diff --git a/main.py b/main.py index a3c93c2..4cd50f0 100644 --- a/main.py +++ b/main.py @@ -1,5 +1,5 @@ #%% -from defs.defs import OFRAnalyser +from defs.computing import OFRAnalyser import numpy as np #%% @@ -12,5 +12,5 @@ analyser = OFRAnalyser(sourcefile="Z:/People/David_Tschan/data/OFR_SMPS/2026/pro analyser.AggregateSamples(samples=[33]) #%% -print(analyser.total_surface) +print(analyser.total_count) # %% diff --git a/run/__init__.py b/run/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/run/__pycache__/__init__.cpython-312.pyc b/run/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000..8ca838a Binary files /dev/null and b/run/__pycache__/__init__.cpython-312.pyc differ diff --git a/run/__pycache__/defs.cpython-312.pyc b/run/__pycache__/defs.cpython-312.pyc new file mode 100644 index 0000000..576ad2b Binary files /dev/null and b/run/__pycache__/defs.cpython-312.pyc differ diff --git a/run/runfile_01.py b/run/runfile_01.py new file mode 100644 index 0000000..e69de29 diff --git a/vis/defs.py b/vis/defs.py deleted file mode 100644 index 4e246ed..0000000 --- a/vis/defs.py +++ /dev/null @@ -1,4 +0,0 @@ -class HelloWorld: - - def __init__(self, word): - self.word = word \ No newline at end of file