libgunshotmatch 0.7.1__py3-none-any.whl → 0.7.3__py3-none-any.whl

libgunshotmatch/__init__.py

@@ -29,5 +29,5 @@ Base library for GunShotMatch.
 __author__: str = "Dominic Davis-Foster"
 __copyright__: str = "2020-2023 Dominic Davis-Foster"
 __license__: str = "MIT License"
-__version__: str = "0.7.1"
+__version__: str = "0.7.3"
 __email__: str = "dominic@davis-foster.co.uk"

libgunshotmatch/datafile.py

@@ -327,7 +327,7 @@ class Datafile:
 		"""
 
 		export_filename = os.path.join(output_dir, f"{self.name}.gsmd")
-		gzip_util.write_gzip_json(export_filename, self.to_dict(), indent=0)
+		gzip_util.write_gzip_json(export_filename, self.to_dict(), indent=None)
 		return export_filename
 
 	@classmethod
@@ -509,7 +509,7 @@ class Repeat:
 		"""
 
 		export_filename = os.path.join(output_dir, f"{self.name}.gsmr")
-		gzip_util.write_gzip_json(export_filename, self.to_dict(), indent=0)
+		gzip_util.write_gzip_json(export_filename, self.to_dict(), indent=None)
 		return export_filename
 
 	@classmethod

libgunshotmatch/gzip_util.py

@@ -28,7 +28,7 @@ Read and write gzipped JSON.
 
 # stdlib
 import gzip
-from typing import Any, Dict, List, OrderedDict, Tuple, Union
+from typing import Any, Dict, List, Optional, OrderedDict, Tuple, Union
 
 # 3rd party
 import sdjson
@@ -54,7 +54,7 @@ def read_gzip_json(path: PathLike) -> JSONOutput:
 		return sdjson.load(f)
 
 
-def write_gzip_json(path: PathLike, data: JSONInput, indent: int = 2) -> None:
+def write_gzip_json(path: PathLike, data: JSONInput, indent: Optional[int] = 2) -> None:
 	"""
 	Write JSON to a gzip file.
 

libgunshotmatch/method/__init__.py

@@ -27,7 +27,7 @@ Methods for GunShotMatch analysis.
 #
 
 try:
-	# 3rd party
+	# stdlib
 	import tomllib  # type: ignore[import]
 except ImportError:
 	import tomli as tomllib  # type: ignore[no-redef]

libgunshotmatch/peak.py

@@ -475,15 +475,18 @@ def filter_aligned_peaks(
 
 		# print("tail of area_alignment=", area_alignment.tail(top_n_peaks))
 
-		# Limit to the largest `ident_top_peaks` peaks
+		# Limit to the largest `top_n_peaks` peaks
 		for peak_no, areas in area_alignment.tail(top_n_peaks).iterrows():
 			# Ignore peak if average peak area is less then min_peak_area
 			if areas["mean"] >= min_peak_area:
 				top_peaks_indices.append(peak_no)
 
 	else:
-		for peak_no, _ in area_alignment.iterrows():
-			top_peaks_indices.append(peak_no)
+		print(f"Filtering to peaks with an average peak area above {min_peak_area}")
+		for peak_no, areas in area_alignment.iterrows():
+			# Ignore peak if average peak area is less then min_peak_area
+			if areas["mean"] >= min_peak_area:
+				top_peaks_indices.append(peak_no)
 
 	# Remove peaks from rt_alignment if they are not in top_peaks_indices,
 	# i.e. they are one of the largest n largest peaks

libgunshotmatch/project.py

@@ -108,7 +108,7 @@ class Project:
 		"""
 
 		export_filename = os.path.join(output_dir, f"{self.name}.gsmp")
-		gzip_util.write_gzip_json(export_filename, self.to_dict(), indent=0)
+		gzip_util.write_gzip_json(export_filename, self.to_dict(), indent=None)
 		return export_filename
 
 	@classmethod

{libgunshotmatch-0.7.1.dist-info → libgunshotmatch-0.7.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: libgunshotmatch
-Version: 0.7.1
+Version: 0.7.3
 Summary: Base library for GunShotMatch.
 Author-email: Dominic Davis-Foster <dominic@davis-foster.co.uk>
 License: MIT
@@ -135,7 +135,7 @@ libgunshotmatch
 .. |language| image:: https://img.shields.io/github/languages/top/GunShotMatch/libgunshotmatch
 	:alt: GitHub top language
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/GunShotMatch/libgunshotmatch/v0.7.1
+.. |commits-since| image:: https://img.shields.io/github/commits-since/GunShotMatch/libgunshotmatch/v0.7.3
 	:target: https://github.com/GunShotMatch/libgunshotmatch/pulse
 	:alt: GitHub commits since tagged version
 

libgunshotmatch-0.7.3.dist-info/RECORD

@@ -0,0 +1,18 @@
+libgunshotmatch/consolidate/__init__.py,sha256=gOqPqFcoSkVob8hKOpcNobK84yADyCwB3UNBPJM3vAc,22834
+libgunshotmatch/consolidate/_fields.py,sha256=7gPIQaFaFySLZFrIuSMjwS84WEBHxZhCNhpXATlYjVw,2691
+libgunshotmatch/consolidate/_spectra.py,sha256=7q_xVPN_oASayLdyMDjwaBLG4maIybHCqkGhiMIO940,2343
+libgunshotmatch/method/__init__.py,sha256=138s5xt_E-WbCf1_H366crhT0PNptB7hD1uOJt2CV8o,9429
+libgunshotmatch/method/_fields.py,sha256=GQNw9GdGhy9c_-0U_31eJDTXr1sG5_t5Lh0Z_nzE0RE,5025
+libgunshotmatch/__init__.py,sha256=pv1kJbZIqxC9x7Ugvh0m05M9LhvAFJGM5kI-2Z1oTzc,1433
+libgunshotmatch/datafile.py,sha256=r20e9fJ5oMx5hTpvPvau4m_ut_CQf0bu6IMU06Ml1mE,16282
+libgunshotmatch/gzip_util.py,sha256=mQuiQI2pCb1Ba5J_HA5TfeMEEQ_lSF_dNDDSRQWoaqo,2270
+libgunshotmatch/peak.py,sha256=X8aDKJctRbYyvnOqXa9saUQLAv04F6mc-oxntsDbyaY,16960
+libgunshotmatch/project.py,sha256=2dvbWA4OHIxJQPjIgEglBbLB6NEQMxvgZA21Qgcb70c,6477
+libgunshotmatch/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+libgunshotmatch/search.py,sha256=qjIXuTo3OqvC_zSLdwZkEDHfza064iYCTZzGeAZoW5s,3137
+libgunshotmatch/utils.py,sha256=H-Ikm6oEGCgRoPvuCo3H5p1iKz3B9PuUqcpcH-rhgYA,4917
+libgunshotmatch-0.7.3.dist-info/LICENSE,sha256=bFtJt-lyVJHV-88FeFa_r3BEOsmpna5qG2KOl9JUNfU,1064
+libgunshotmatch-0.7.3.dist-info/METADATA,sha256=gOSO8CvLDpl5xnJRnIskkdSRtCb5GjX-XUmlfQ-9Kko,6392
+libgunshotmatch-0.7.3.dist-info/WHEEL,sha256=3vSnEhs48RUlSXcCXKCl4DOHs_qqaP2dU3IGkMqN2oI,84
+libgunshotmatch-0.7.3.dist-info/entry_points.txt,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+libgunshotmatch-0.7.3.dist-info/RECORD,,

libgunshotmatch-0.7.1.dist-info/RECORD

@@ -1,18 +0,0 @@
-libgunshotmatch/consolidate/__init__.py,sha256=gOqPqFcoSkVob8hKOpcNobK84yADyCwB3UNBPJM3vAc,22834
-libgunshotmatch/consolidate/_fields.py,sha256=7gPIQaFaFySLZFrIuSMjwS84WEBHxZhCNhpXATlYjVw,2691
-libgunshotmatch/consolidate/_spectra.py,sha256=7q_xVPN_oASayLdyMDjwaBLG4maIybHCqkGhiMIO940,2343
-libgunshotmatch/method/__init__.py,sha256=k0Hs3c5Q13CENQHGtHVeDW2jQtR6UtiB1IVf_77lCT4,9432
-libgunshotmatch/method/_fields.py,sha256=GQNw9GdGhy9c_-0U_31eJDTXr1sG5_t5Lh0Z_nzE0RE,5025
-libgunshotmatch/__init__.py,sha256=7QhxNRtPqOz7VBUPCKPF9uaMe4uR0nnuoshgiINneig,1433
-libgunshotmatch/datafile.py,sha256=sKCatM0F3fmceHQYObwgYr3EX9whKA0U2lOj-xqLt4c,16276
-libgunshotmatch/gzip_util.py,sha256=vVGZLAhW1WmENt2kDXMY68UR72MHvsCBPaB-xCyVYbg,2250
-libgunshotmatch/peak.py,sha256=pn8eYS8dfBOCjCRr-rciU3v9k1EREvH6jYqQibdjdok,16777
-libgunshotmatch/project.py,sha256=t4YLCTKA1YYeRMiaXNz1-k21wYTtidN9FJM4aN9-rbw,6474
-libgunshotmatch/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-libgunshotmatch/search.py,sha256=qjIXuTo3OqvC_zSLdwZkEDHfza064iYCTZzGeAZoW5s,3137
-libgunshotmatch/utils.py,sha256=H-Ikm6oEGCgRoPvuCo3H5p1iKz3B9PuUqcpcH-rhgYA,4917
-libgunshotmatch-0.7.1.dist-info/LICENSE,sha256=bFtJt-lyVJHV-88FeFa_r3BEOsmpna5qG2KOl9JUNfU,1064
-libgunshotmatch-0.7.1.dist-info/METADATA,sha256=rvRV47dgFsu7xqyZQ6OukhBY9icHJ7KpqD3QvjXwVEc,6392
-libgunshotmatch-0.7.1.dist-info/WHEEL,sha256=3vSnEhs48RUlSXcCXKCl4DOHs_qqaP2dU3IGkMqN2oI,84
-libgunshotmatch-0.7.1.dist-info/entry_points.txt,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-libgunshotmatch-0.7.1.dist-info/RECORD,,