From b7e22187148530e5ee37099cb37aeb340fd90af9 Mon Sep 17 00:00:00 2001 From: Philipp Oleynik <pholey@utu.fi> Date: Wed, 12 Feb 2020 14:20:47 +0200 Subject: [PATCH] bugfix --- .idea/.gitignore | 2 ++ .idea/inspectionProfiles/profiles_settings.xml | 6 ++++++ .idea/misc.xml | 4 ++++ .idea/modules.xml | 8 ++++++++ .idea/philipp-packages.iml | 11 +++++++++++ .idea/rSettings.xml | 4 ++++ .idea/vcs.xml | 6 ++++++ sixsutils.py | 6 +++--- 8 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/philipp-packages.iml create mode 100644 .idea/rSettings.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..e7e9d11 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,2 @@ +# Default ignored files +/workspace.xml diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..105ce2d --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ +<component name="InspectionProjectProfileManager"> + <settings> + <option name="USE_PROJECT_PROFILE" value="false" /> + <version value="1.0" /> + </settings> +</component> \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..60dd51e --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (PycharmProjects)" project-jdk-type="Python SDK" /> +</project> \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..0ee17a9 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectModuleManager"> + <modules> + <module fileurl="file://$PROJECT_DIR$/.idea/philipp-packages.iml" filepath="$PROJECT_DIR$/.idea/philipp-packages.iml" /> + </modules> + </component> +</project> \ No newline at end of file diff --git a/.idea/philipp-packages.iml b/.idea/philipp-packages.iml new file mode 100644 index 0000000..8dc09e5 --- /dev/null +++ b/.idea/philipp-packages.iml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="PYTHON_MODULE" version="4"> + <component name="NewModuleRootManager"> + <content url="file://$MODULE_DIR$" /> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> + <component name="TestRunnerService"> + <option name="PROJECT_TEST_RUNNER" value="pytest" /> + </component> +</module> \ No newline at end of file diff --git a/.idea/rSettings.xml b/.idea/rSettings.xml new file mode 100644 index 0000000..325f6cb --- /dev/null +++ b/.idea/rSettings.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="RSettings" path="/usr/bin/R" /> +</project> \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="VcsDirectoryMappings"> + <mapping directory="$PROJECT_DIR$" vcs="Git" /> + </component> +</project> \ No newline at end of file diff --git a/sixsutils.py b/sixsutils.py index a73fc4a..48dec75 100644 --- a/sixsutils.py +++ b/sixsutils.py @@ -18,9 +18,9 @@ else: npzfile = np.load('/home/pholey/git/philipp-packages/sixs_lut.npz') sixs_lut = npzfile['arr_0'] - side_threshold = 0.035 # TODO: It is a magic number. - core_threshold = 0.50 # in MeV TODO: Another magic number. Chosen as an initial value. - radiation_area = 5 * 5 * 4 * const.pi # radius 5 cm sphere area in cm2 +side_threshold = 0.035 # TODO: It is a magic number. +core_threshold = 0.50 # in MeV TODO: Another magic number. Chosen as an initial value. +radiation_area = 5 * 5 * 4 * const.pi # radius 5 cm sphere area in cm2 def get_basepath(): -- GitLab