From fbc425d0237a6cf8129101d10ad76278689ffaa6 Mon Sep 17 00:00:00 2001 From: Johannes Schumann <johannes.schumann@fau.de> Date: Mon, 17 Jan 2022 15:54:28 +0100 Subject: [PATCH] Update format according to yapf --- km3buu/config.py | 1 + km3buu/geometry.py | 3 +++ km3buu/jobcard.py | 1 + km3buu/output.py | 2 ++ km3buu/tests/test_config.py | 1 + km3buu/tests/test_ctrl.py | 2 ++ km3buu/tests/test_environment.py | 1 + km3buu/tests/test_geometry.py | 3 +++ km3buu/tests/test_jobcard.py | 4 ++++ km3buu/tests/test_output.py | 3 +++ km3buu/tests/test_propagation.py | 1 + 11 files changed, 22 insertions(+) diff --git a/km3buu/config.py b/km3buu/config.py index b9c7a0c..9059d6b 100644 --- a/km3buu/config.py +++ b/km3buu/config.py @@ -45,6 +45,7 @@ GSEAGEN_MEDIA_COMPOSITION_FILE = "MediaComposition.xml" class Config(object): + def __init__(self, config_path=CONFIG_PATH): self.config = ConfigParser() self._config_path = config_path diff --git a/km3buu/geometry.py b/km3buu/geometry.py index 1ae1135..42378c3 100644 --- a/km3buu/geometry.py +++ b/km3buu/geometry.py @@ -19,6 +19,7 @@ class DetectorVolume(ABC): """ Detector geometry class """ + def __init__(self): self._volume = -1.0 self._coord_origin = (0., 0., 0.) @@ -82,6 +83,7 @@ class CanVolume(DetectorVolume): zmax: float [m] (default: 476.5) Cylinder top z position """ + def __init__(self, radius=403.4, zmin=0.0, zmax=476.5): super().__init__() self._radius = radius @@ -118,6 +120,7 @@ class SphericalVolume(DetectorVolume): Coordinate center of the sphere (x, y, z) """ + def __init__(self, radius, coord_origin=(0, 0, 0)): super().__init__() self._radius = radius diff --git a/km3buu/jobcard.py b/km3buu/jobcard.py index a03f217..15c99f6 100644 --- a/km3buu/jobcard.py +++ b/km3buu/jobcard.py @@ -58,6 +58,7 @@ class Jobcard(f90nml.Namelist): input_path: str The input path pointing to the GiBUU lookup data which should be used """ + def __init__(self, *args, filename=DEFAULT_JOBCARD_FILENAME, diff --git a/km3buu/output.py b/km3buu/output.py index 31766f0..61e5f75 100644 --- a/km3buu/output.py +++ b/km3buu/output.py @@ -274,6 +274,7 @@ def read_nu_abs_xsection(filepath): class GiBUUOutput: + def __init__(self, data_dir): """ Class for parsing GiBUU output files @@ -580,6 +581,7 @@ class GiBUUOutput: return self._generated_events def _determine_flux_index(self): + def fluxfunc(x, a, b): return a * x**b diff --git a/km3buu/tests/test_config.py b/km3buu/tests/test_config.py index 18e2a13..65436a0 100644 --- a/km3buu/tests/test_config.py +++ b/km3buu/tests/test_config.py @@ -32,6 +32,7 @@ path=/tmp/gseagen class TestConfig(unittest.TestCase): + def setUp(self): self.cfg_tmpfile = NamedTemporaryFile(delete=False) self.mock_image_file = NamedTemporaryFile(delete=False) diff --git a/km3buu/tests/test_ctrl.py b/km3buu/tests/test_ctrl.py index 34d4faa..2309017 100644 --- a/km3buu/tests/test_ctrl.py +++ b/km3buu/tests/test_ctrl.py @@ -25,6 +25,7 @@ TESTDATA_DIR = data_path("gibuu") class TestCTRLbyJobcardFile(unittest.TestCase): + def setUp(self): self.filename = join(TESTDATA_DIR, "km3net_testdata.job") self.output_dir = TemporaryDirectory() @@ -48,6 +49,7 @@ class TestCTRLbyJobcardFile(unittest.TestCase): class TestCTRLbyJobcardObject(unittest.TestCase): + def setUp(self): log = get_logger("ctrl.py") log.setLevel("INFO") diff --git a/km3buu/tests/test_environment.py b/km3buu/tests/test_environment.py index 247690b..b5d76bf 100644 --- a/km3buu/tests/test_environment.py +++ b/km3buu/tests/test_environment.py @@ -19,6 +19,7 @@ from km3buu import DOCKER_URL, IMAGE_NAME class TestBuild(unittest.TestCase): + def test_wrong_dir_path(self): wrong_path = "foobar" try: diff --git a/km3buu/tests/test_geometry.py b/km3buu/tests/test_geometry.py index 292cac2..10a22bd 100644 --- a/km3buu/tests/test_geometry.py +++ b/km3buu/tests/test_geometry.py @@ -17,12 +17,14 @@ import numpy as np class TestGeneralGeometry(unittest.TestCase): + def test_abstract_init(self): with self.assertRaises(TypeError) as ctx: d = DetectorVolume() class TestSphere(unittest.TestCase): + def setUp(self): self.detector_geometry = SphericalVolume(20, (2, 2, 2)) @@ -44,6 +46,7 @@ class TestSphere(unittest.TestCase): class TestCan(unittest.TestCase): + def setUp(self): self.detector_geometry = CanVolume() diff --git a/km3buu/tests/test_jobcard.py b/km3buu/tests/test_jobcard.py index 6fc45b0..69dc539 100644 --- a/km3buu/tests/test_jobcard.py +++ b/km3buu/tests/test_jobcard.py @@ -20,6 +20,7 @@ from tempfile import TemporaryFile, TemporaryDirectory class TestJobcard(unittest.TestCase): + def setUp(self): self.test_jobcard = Jobcard() # Insert some test elements @@ -49,6 +50,7 @@ class TestJobcard(unittest.TestCase): class TestNeutrinoEnergyRangeJobcard(unittest.TestCase): + def setUp(self): self.test_fluxfile = TemporaryFile() self.test_Z = np.random.randint(1, 100) @@ -99,6 +101,7 @@ class TestNeutrinoEnergyRangeJobcard(unittest.TestCase): class TestNeutrinoSingleEnergyJobcard(unittest.TestCase): + def setUp(self): self.test_fluxfile = TemporaryFile() self.test_Z = np.random.randint(1, 100) @@ -133,6 +136,7 @@ class TestNeutrinoSingleEnergyJobcard(unittest.TestCase): class TestJobcardSeed(unittest.TestCase): + def setUp(self): jc = generate_neutrino_jobcard(100, "CC", diff --git a/km3buu/tests/test_output.py b/km3buu/tests/test_output.py index e6ff083..02c9aba 100644 --- a/km3buu/tests/test_output.py +++ b/km3buu/tests/test_output.py @@ -37,6 +37,7 @@ except ModuleNotFoundError: class TestXSection(unittest.TestCase): + def test_xsection_all(self): filename = join(TESTDATA_DIR, XSECTION_FILENAMES["all"]) xsection = read_nu_abs_xsection(filename) @@ -47,6 +48,7 @@ class TestXSection(unittest.TestCase): class TestGiBUUOutput(unittest.TestCase): + def setup_class(self): self.output = GiBUUOutput(TESTDATA_DIR) @@ -91,6 +93,7 @@ class TestGiBUUOutput(unittest.TestCase): @pytest.mark.skipif(not KM3NET_LIB_AVAILABLE, reason="KM3NeT dataformat required") class TestAANET(unittest.TestCase): + def setUp(self): output = GiBUUOutput(TESTDATA_DIR) datafile = NamedTemporaryFile(suffix=".root") diff --git a/km3buu/tests/test_propagation.py b/km3buu/tests/test_propagation.py index 27d1704..b1cbea9 100644 --- a/km3buu/tests/test_propagation.py +++ b/km3buu/tests/test_propagation.py @@ -28,6 +28,7 @@ pp.RandomGenerator.get().set_seed(1234) @pytest.mark.skip(reason="CI boost lib problem") class TestTauPropagation(unittest.TestCase): + def setUp(self): data = ak.Array({ "lepOut_E": [ -- GitLab