add Fulcrum Acoustic RX series + some small code fixes

datas/__init__.py

@@ -34,15 +34,14 @@ class SPL(TypedDict, total=False):
 
 class Size(TypedDict):
     """
-    This TypedDict contains the size of the speaker opening in millimeters for the left and right sides.
+    This TypedDict contains the size of the speaker in millimeters.
 
     Attributes:
-        left (float): Left side opening size in mm.
-        right (float): Right side opening size in mm.
+        height (float): in mm.
+        width (float): in mm.
+        depthh (float): in mm.
     """
 
-    left: float
-    right: float
     height: float
     width: float
     depth: float

datas/eq/Fulcrum Acoustic RX4/conf-autoeq.json

@@ -0,0 +1,47 @@
+{
+    "loss": "flat_loss",
+    "loss_weigths": [
+        100.0,
+        1.0
+    ],
+    "plus_and_minus": true,
+    "use_all_biquad": null,
+    "elastic": 0.8,
+    "fs": 48000,
+    "freq_reg_min": 22.4,
+    "freq_reg_max": 20000,
+    "freq_mean_min": 100,
+    "freq_mean_max": 300,
+    "curve_names": [
+        "Listening Window"
+    ],
+    "target_min_freq": 165.0,
+    "target_max_freq": 16000,
+    "slope_on_axis": 0,
+    "slope_listening_window": -0.5,
+    "slope_early_reflections": -4,
+    "slope_estimated_inroom": -6.5,
+    "slope_sound_power": -9,
+    "smooth_measurements": true,
+    "smooth_window_size": 21,
+    "smooth_order": 3,
+    "use_grapheq": false,
+    "grapheq_name": null,
+    "use_3dB_target": true,
+    "optimisation": "global",
+    "MAX_NUMBER_PEQ": 3,
+    "MAX_STEPS_FREQ": 6,
+    "MAX_STEPS_DBGAIN": 6,
+    "MAX_STEPS_Q": 6,
+    "MAX_ITER": 15000,
+    "MIN_DBGAIN": 0.75,
+    "MAX_DBGAIN": 3,
+    "MIN_Q": 0.25,
+    "MAX_Q": 3,
+    "verbose": true,
+    "smoke_test": false,
+    "force": true,
+    "version": "0.26",
+    "level": 30,
+    "generate_images_only": false
+}

datas/eq/Fulcrum Acoustic RX4/iir.txt

@@ -0,0 +1 @@
+iir-autoeq.txt

datas/incomplete.py

@@ -4,7 +4,9 @@
 The set is used to decrease verbosity of warnings.
 """
 
-known_incomplete_measurements = set([
-    ("Andersson HIS 2.1", "misc-ageve"),
-    ("Paradigm Millenia LP 2", "misc-matthews"),
-])
+known_incomplete_measurements = set(
+    [
+        ("Andersson HIS 2.1", "misc-ageve"),
+        ("Paradigm Millenia LP 2", "misc-matthews"),
+    ]
+)

datas/metadata_f.py

@@ -983,6 +983,166 @@
             },
         },
     },
+    "Fulcrum Acoustic RX4": {
+        "brand": "Fulcrum Acoustic",
+        "model": "RX4",
+        "type": "active",
+        "price": "",
+        "amount": "each",
+        "shape": "liveportable",
+        "default_measurement": "vendor",
+        "measurements": {
+            "vendor": {
+                "origin": "Vendors-Fulcrum Acoustic",
+                "format": "gll_hv_txt",
+                "data_acquisition": gll_data_acquisition_std,
+                "quality": "medium",
+                "review_published": "20240825",
+                "extras": {
+                    "is_equed": True,
+                },
+                "specifications": {
+                    "dispersion": {
+                        "horizontal": 100,
+                        "vertical": 100,
+                    },
+                    # equalized
+                    "sensitivity": 85,
+                    # equalized
+                    "SPL": {
+                        "continuous": 105,
+                        "peak": 111,
+                    },
+                    "size": {
+                        "height": 127,
+                        "width": 135,
+                        "depth": 132,
+                    },
+                    "weight": 1.4,
+                },
+            },
+        },
+    },
+    "Fulcrum Acoustic RX5": {
+        "brand": "Fulcrum Acoustic",
+        "model": "RX5",
+        "type": "active",
+        "price": "",
+        "amount": "each",
+        "shape": "liveportable",
+        "default_measurement": "vendor",
+        "measurements": {
+            "vendor": {
+                "origin": "Vendors-Fulcrum Acoustic",
+                "format": "gll_hv_txt",
+                "data_acquisition": gll_data_acquisition_std,
+                "quality": "medium",
+                "review_published": "20240825",
+                "extras": {
+                    "is_equed": True,
+                },
+                "specifications": {
+                    "dispersion": {
+                        "horizontal": 90,
+                        "vertical": 75,
+                    },
+                    # equalized
+                    "sensitivity": 89,
+                    # equalized
+                    "SPL": {
+                        "continuous": 111,
+                        "peak": 117,
+                    },
+                    "size": {
+                        "height": 152,
+                        "width": 220,
+                        "depth": 151,
+                    },
+                    "weight": 4.1,
+                },
+            },
+        },
+    },
+    "Fulcrum Acoustic RX6": {
+        "brand": "Fulcrum Acoustic",
+        "model": "RX6",
+        "type": "active",
+        "price": "",
+        "amount": "each",
+        "shape": "liveportable",
+        "default_measurement": "vendor",
+        "measurements": {
+            "vendor": {
+                "origin": "Vendors-Fulcrum Acoustic",
+                "format": "gll_hv_txt",
+                "data_acquisition": gll_data_acquisition_std,
+                "quality": "medium",
+                "review_published": "20240825",
+                "extras": {
+                    "is_equed": True,
+                },
+                "specifications": {
+                    "dispersion": {
+                        "horizontal": 90,
+                        "vertical": 75,
+                    },
+                    # equalized
+                    "sensitivity": 90,
+                    # equalized
+                    "SPL": {
+                        "continuous": 112,
+                        "peak": 118,
+                    },
+                    "size": {
+                        "height": 184,
+                        "width": 273,
+                        "depth": 154,
+                    },
+                    "weight": 4.9,
+                },
+            },
+        },
+    },
+    "Fulcrum Acoustic RX8": {
+        "brand": "Fulcrum Acoustic",
+        "model": "RX8",
+        "type": "active",
+        "price": "",
+        "amount": "each",
+        "shape": "liveportable",
+        "default_measurement": "vendor",
+        "measurements": {
+            "vendor": {
+                "origin": "Vendors-Fulcrum Acoustic",
+                "format": "gll_hv_txt",
+                "data_acquisition": gll_data_acquisition_std,
+                "quality": "medium",
+                "review_published": "20240825",
+                "extras": {
+                    "is_equed": True,
+                },
+                "specifications": {
+                    "dispersion": {
+                        "horizontal": 90,
+                        "vertical": 75,
+                    },
+                    # equalized
+                    "sensitivity": 93,
+                    # equalized
+                    "SPL": {
+                        "continuous": 116,
+                        "peak": 122,
+                    },
+                    "size": {
+                        "height": 229,
+                        "width": 323,
+                        "depth": 235,
+                    },
+                    "weight": 6.4,
+                },
+            },
+        },
+    },
     "Fulcrum Acoustic RX599": {
         "brand": "Fulcrum Acoustic",
         "model": "RX599",

datas/metadata_s.py

@@ -660,7 +660,7 @@
         "brand": "SunAudio",
         "model": "Purified 4 4XA25B Alu+Berryllium",
         "type": "passive",
-        "price": "3228",
+        "price": "3650",
         "amount": "pair",
         "shape": "bookshelves",
         "default_measurement": "vendor-v1-20240730",
@@ -682,7 +682,7 @@
         "brand": "SunAudio",
         "model": "Purified 4 4XP25B Fiber+Berryllium",
         "type": "passive",
-        "price": "3228",
+        "price": "3650",
         "amount": "pair",
         "shape": "bookshelves",
         "default_measurement": "vendor-v1-20240730",

datas/speaker.tmpl

@@ -18,9 +18,16 @@
                     "yt": "",
                 },
                 "review_published": "202404xx",
+                "extras": {
+                    "is_equed": False,
+                },
                 "specifications": {
                     "sensitivity": ,
                     "impedance": ,
+                    "dispersion": {
+                        "horizontal": ,
+                        "vertical": ,
+                    },
                     "SPL": {
                         "peak": ,
                     },

package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "bulma": "^1.0.1",
+    "bulma": "^1.0.2",
     "fuse.js": "^7.0.0",
     "handlebars": "^4.7.8",
     "npm": "^10.7.0",

src/spinorama/load_spl_hv_txt.py

@@ -128,7 +128,11 @@ def parse_graphs_speaker_spl_hv_txt(
     h_status, h_spl = parse_graph_spl_hv_txt(dirname, "H")
     v_status, v_spl = parse_graph_spl_hv_txt(dirname, "V")
 
-    if len(h_spl.keys()) + len(v_spl.keys()) < 72 and not known_incomplete_measurements.has("{} {}".format(speaker_brand, speaker_name), version):
+    if (
+        len(h_spl.keys()) + len(v_spl.keys()) < 72
+        and ("{} {}".format(speaker_brand, speaker_name), version)
+        not in known_incomplete_measurements
+    ):
         logger.warning("We have only partial data in %s", dirname)
 
     return h_status and v_status, (h_spl, v_spl)