Merge branch 'master' into 46-manipulations-dot-py-rewrite

Author: dehoni

.codescene/code-health-rules.json

@@ -0,0 +1,123 @@
+{
+  "rule_sets" : [ {
+    "thresholds" : [ {
+      "name" : "constructor_max_arguments",
+      "value" : "7"
+    }, {
+      "name" : "file_lines_of_code_for_alert",
+      "value" : "5000"
+    }, {
+      "name" : "file_lines_of_code_for_critical_alert",
+      "value" : "2500"
+    }, {
+      "name" : "file_lines_of_code_for_warning",
+      "value" : "1000"
+    }, {
+      "name" : "file_mean_cyclomatic_complexity_warning",
+      "value" : "8"
+    }, {
+      "name" : "function_bumpy_road_bumps_for_warning",
+      "value" : "8"
+    }, {
+      "name" : "function_bumpy_road_nesting_level_depth",
+      "value" : "25"
+    }, {
+      "name" : "function_complex_conditional_branches_alert",
+      "value" : "25"
+    }, {
+      "name" : "function_complex_conditional_branches_warning",
+      "value" : "10"
+    }, {
+      "name" : "function_cyclomatic_complexity_alert",
+      "value" : "25"
+    }, {
+      "name" : "function_cyclomatic_complexity_warning",
+      "value" : "5"
+    }, {
+      "name" : "function_lines_of_code_alert",
+      "value" : "2500"
+    }, {
+      "name" : "function_lines_of_code_warning",
+      "value" : "1000"
+    }, {
+      "name" : "function_max_arguments",
+      "value" : "7"
+    }, {
+      "name" : "function_nesting_depth_warning",
+      "value" : "10"
+    }
+    ],
+    "matching_content_path" : "**/*",
+    "matching_content_path_doc" : "**/*",
+    "rules" : [ {
+      "name" : "Brain Method",
+      "weight" : 0.0
+    }, {
+      "name" : "Bumpy Road Ahead",
+      "weight" : 0.0
+    }, {
+      "name" : "Code Duplication",
+      "weight" : 0.0
+    }, {
+      "name" : "Complex Conditional",
+      "weight" : 0.0
+    }, {
+      "name" : "Complex Method",
+      "weight" : 0.0
+    }, {
+      "name" : "Constructor Over-Injection",
+      "weight" : 0.0
+    }, {
+      "name" : "Deep, Global Nested Complexity",
+      "weight" : 0.0
+    }, {
+      "name" : "Deep, Nested Complexity",
+      "weight" : 0.0
+    }, {
+      "name" : "Duplicated Assertion Blocks",
+      "weight" : 0.0
+    }, {
+      "name" : "Excess Number of Function Arguments",
+      "weight" : 0.0
+    }, {
+      "name" : "Global Conditionals",
+      "weight" : 0.0
+    }, {
+      "name" : "Large Assertion Blocks",
+      "weight" : 0.0
+    }, {
+      "name" : "Large Embedded Code Block",
+      "weight" : 0.0
+    }, {
+      "name" : "Large Method",
+      "weight" : 0.0
+    }, {
+      "name" : "Lines of Code in a Single File",
+      "weight" : 0.0
+    }, {
+      "name" : "Lines of Declarations in a Single File",
+      "weight" : 0.0
+    }, {
+      "name" : "Low Cohesion",
+      "weight" : 0.0
+    }, {
+      "name" : "Missing Arguments Abstractions",
+      "weight" : 0.0
+    }, {
+      "name" : "Number of Functions in a Single Module",
+      "weight" : 0.0
+    }, {
+      "name" : "Overall Code Complexity",
+      "weight" : 0.0
+    }, {
+      "name" : "Overall Function Size",
+      "weight" : 0.0
+    }, {
+      "name" : "Primitive Obsession",
+      "weight" : 0.0
+    }, {
+      "name" : "String Heavy Function Arguments",
+      "weight" : 0.0
+    } ]
+  } ]
+}

.codescene/custom-quality-gates.json

@@ -0,0 +1,15 @@
+{
+  "rule_sets": [
+    {
+      "quality_gates": {
+        "hotspot_decline": true,
+        "critical_health_rules": true,
+        "refactoring_goals": false,
+        "supervise_goals": false,
+        "new_code_health": true,
+        "advisory_health_rules": true,
+        "codeowners_for_critical_code": false
+      }
+    }
+  ]
+}

sasdata/data_util/manipulations.py

@@ -88,7 +88,7 @@ def position_and_wavelength_to_q(dx: float, dy: float, detector_distance: float,
     plane_dist = math.sqrt(dx * dx + dy * dy)
     # Half of the scattering angle
     theta = 0.5 * math.atan(plane_dist / detector_distance)
-    return (4.0 * math.pi / wavelength) * math.sin(theta)
+    return (2.0* TwoPi / wavelength) * math.sin(theta)
 
 
 def get_q_compo(dx: float, dy: float, detector_distance: float, wavelength: float, compo: str | None = None) -> float:
@@ -100,7 +100,7 @@ def get_q_compo(dx: float, dy: float, detector_distance: float, wavelength: floa
         if dx >= 0:
             angle_xy = 0
         else:
-            angle_xy = math.pi
+            angle_xy = Pi
     else:
         angle_xy = math.atan(dx / dy)
 
@@ -121,9 +121,9 @@ def flip_phi(phi: float) -> float:
     :return: phi in >=0 and <=2Pi
     """
     if phi < 0:
-        phi_out = phi + (2 * math.pi)
-    elif phi > (2 * math.pi):
-        phi_out = phi - (2 * math.pi)
+        phi_out = phi + (TwoPi)
+    elif phi > (TwoPi):
+        phi_out = phi % TwoPi
     else:
         phi_out = phi
     return phi_out

sasdata/quantities/constants.py

@@ -0,0 +1,4 @@
+import math
+
+Pi = math.pi
+TwoPi = 2 * math.pi