xedocs 0.2.31__tar.gz → 0.2.44__tar.gz

{xedocs-0.2.31 → xedocs-0.2.44}/PKG-INFO

@@ -1,16 +1,15 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: xedocs
-Version: 0.2.31
+Version: 0.2.44
 Summary: Top-level package for xedocs.
-Home-page: https://github.com/XENONnT/xedocs
+License-File: AUTHORS.rst
 Author: Yossi Mosbacher
 Author-email: joe.mosbacher@gmail.com
-Requires-Python: >=3.8,<4.0
+Requires-Python: >=3.9,<3.13
 Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -19,14 +18,15 @@ Provides-Extra: all
 Provides-Extra: db
 Requires-Dist: appdirs (>=1.4.4,<2.0.0)
 Requires-Dist: click
-Requires-Dist: parse (>=1.19.1,<2.0.0)
+Requires-Dist: parse (>=1.20.2,<2.0.0)
 Requires-Dist: pymongo ; extra == "db"
 Requires-Dist: pyyaml (>=6.0,<7.0)
-Requires-Dist: rframe (>=0.2.21,<0.3.0)
+Requires-Dist: rframe (>=0.2.25,<0.3.0)
 Requires-Dist: rich
-Requires-Dist: tinydb (>=4.7.0,<5.0.0)
-Requires-Dist: tqdm (>=4.64.1,<5.0.0)
+Requires-Dist: tinydb (>=4.8.2,<5.0.0)
+Requires-Dist: tqdm (>=4.67.1,<5.0.0)
 Requires-Dist: xeauth (>=0.2.3,<0.3.0)
+Project-URL: Homepage, https://github.com/XENONnT/xedocs
 Description-Content-Type: text/x-rst
 
 =======================================

{xedocs-0.2.31 → xedocs-0.2.44}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool]
 [tool.poetry]
 name = "xedocs"
-version = "0.2.31"
+version = "0.2.44"
 homepage = "https://github.com/XENONnT/xedocs"
 description = "Top-level package for xedocs."
 authors = ["Yossi Mosbacher <joe.mosbacher@gmail.com>"]
@@ -10,9 +10,9 @@ classifiers=[
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
     'Natural Language :: English',
-    'Programming Language :: Python :: 3.8',
     'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: 3.10',
+    'Programming Language :: Python :: 3.11',
 ]
 packages = [
     { include = "xedocs" },
@@ -20,23 +20,23 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = ">=3.8,<4.0"
+python = ">=3.9,<3.13"
 click = "*"
 rich = "*"
-rframe = "^0.2.21"
+rframe = "^0.2.25"
 pymongo = {version = "*", optional = true}
 appdirs = "^1.4.4"
-tinydb = "^4.7.0"
-tqdm = "^4.64.1"
+tinydb = "^4.8.2"
+tqdm = "^4.67.1"
 xeauth = "^0.2.3"
 pyyaml = "^6.0"
-parse = "^1.19.1"
+parse = "^1.20.2"
 
 [tool.poetry.extras]
 db = ["pymongo"]
 all = ["db"]
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 bumpversion = "*"
 coverage = "*"
 flake8 = "*"
@@ -65,7 +65,7 @@ xedocs = 'xedocs.cli:main'
 "xedocs_protocol" = "xedocs._straxen_plugin"
 
 [build-system]
-requires = ["poetry-core>=1.0.8", "setuptools"]
+requires = ["poetry-core>=1.8.3", "setuptools"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.dephell.main]

{xedocs-0.2.31 → xedocs-0.2.44}/tests/test_corrections.py

@@ -310,7 +310,7 @@ class TestCorrections(unittest.TestCase):
 
         if not clock.after_cutoff(left) and clock.after_cutoff(right):
             cutoff = clock.cutoff_datetime()
-            half_diff = (cutoff - left) / 2
+            half_diff = (cutoff - clock.normalize_tz(left)) / 2
             if half_diff > datetime.timedelta(seconds=1):
                 with self.assertRaises(UpdateError):
                     last_doc.time = (left, left + half_diff)

{xedocs-0.2.31 → xedocs-0.2.44}/xedocs/__init__.py

@@ -2,7 +2,7 @@
 
 __author__ = """Yossi Mosbacher"""
 __email__ = "joe.mosbacher@gmail.com"
-__version__ = "0.2.31"
+__version__ = "0.2.44"
 
 
 import logging

{xedocs-0.2.31 → xedocs-0.2.44}/xedocs/dispatchers.py

@@ -54,8 +54,8 @@ def read_csv_files(path, **kwargs) -> List[dict]:
     docs =[]
     
     with fsspec.open_files(path, **kwargs) as fs:
-         kwargs = rframe.utils.filter_kwargs(pd.read_csv, kwargs)
-         for f in fs:
+        kwargs = rframe.utils.filter_kwargs(pd.read_csv, kwargs)
+        for f in fs:
             ds = pd.read_csv(f, **kwargs).to_dict(orient='records')
             docs.extend(ds)
     return docs

{xedocs-0.2.31 → xedocs-0.2.44}/xedocs/schemas/constants.py

@@ -22,3 +22,5 @@ DIFFUSED_SOURCE = Literal["rn-220", "rn-222", "kr-83m", "ar-37",]
 DETECTOR = Literal["tpc", "neutron_veto", "muon_veto", "tpc_he"]
 
 PARTITION = Literal["all_tpc", "ab", "cd"]
+
+SIGNAL = Literal["s1", "s2"]

{xedocs-0.2.31 → xedocs-0.2.44}/xedocs/schemas/corrections/base_references.py

@@ -93,7 +93,7 @@ class BaseMap(BaseResourceReference):
                         'dill.gz','dill', 'npy_pickle',
                         'binary', 'text', 'txt', 'csv']
 
-    algorithm: Literal["cnn", "gcn", "mlp"] = rframe.Index()
+    algorithm: Literal["cnn", "gcn", "mlp", "cnf"] = rframe.Index()
 
     value: str
 
@@ -108,8 +108,8 @@ class BaseMap(BaseResourceReference):
 
     @property
     def local_file(self):
-        import straxen
-        downloader = straxen.MongoDownloader()
+        import utilix
+        downloader = utilix.mongo_storage.MongoDownloader()
         return downloader.download_single(self.value)
 
     @property

{xedocs-0.2.31 → xedocs-0.2.44}/xedocs/schemas/corrections/implementations/__init__.py

@@ -14,6 +14,7 @@ from .se_gains import *
 from .electron_diffusion_cte import *
 from .baseline_samples_nv import *
 from .relative_light_yield import *
+from .relative_charge_yield import *
 from .s1_aft_xyz import *
 from .avg_se_gain import *
 from .bayes_model import *
@@ -26,3 +27,4 @@ from .z_bias import *
 from .cs2_aft_corrections import *
 from .se_gain_partition import *
 from .test_correction import *
+from .peak_reconstruction_bias import *

{xedocs-0.2.31 → xedocs-0.2.44}/xedocs/schemas/corrections/implementations/baseline_samples_nv.py

@@ -14,4 +14,4 @@ from ..base_corrections import TimeSampledCorrection
 class BaselineSamplesNV(TimeSampledCorrection):
 
     _ALIAS = "baseline_samples_nv"
-    value: float
+    value: int

xedocs-0.2.44/xedocs/schemas/corrections/implementations/peak_reconstruction_bias.py

@@ -0,0 +1,21 @@
+"""
+Peak Reconstruction Bias
+
+Atul Prajapati, Carlo Fuselli, Chiara Di Donato
+
+https://xe1t-wiki.lngs.infn.it/doku.php?id=xenon:xennont:peak_reconstruction_bias_sr2
+Description: We know that there are multiple effects that introduce a bias in the reconstructed area. We estimate this bias with simulations produced with fuse. We compare the raw area that is the input, with the reconstrcuted area. We observe that effects like thresholds, afterpulses (AP) and noise introduce an energy dependent bias of the order of 2-3%. We want to provide a correction for the S1 and S2 areas to take these effects into account. Note that photo-ionisation also induces a similar bias, but this topic is not addressed in this notes (for now). 
+
+"""
+import rframe
+
+from ..base_references import BaseResourceReference
+from ...constants import SIGNAL
+
+class PeakReconstructionBias(BaseResourceReference):
+    _ALIAS = "peak_reconstruction_bias"
+    fmt = "json"
+
+    signal: SIGNAL = rframe.Index()
+
+    value: str

{xedocs-0.2.31 → xedocs-0.2.44}/xedocs/schemas/corrections/implementations/position_reconstruction.py

@@ -8,7 +8,7 @@ See description in the Team C overview page [here](https://xe1t-wiki.lngs.infn.i
 
 Mostly following the "OFF PMTs" list [here](https://xe1t-wiki.lngs.infn.it/doku.php?id=xenon:xenonnt:dsg:pmt:gains:pmtsoff)
 
-More information on the flow model can be found [here](https://xe1t-wiki.lngs.infn.it/doku.php?id=xenon:xenonnt:svetter:conditional_norm_flow_posrec_principle)
+More information on the cnf model can be found [here](https://xe1t-wiki.lngs.infn.it/doku.php?id=xenon:xenonnt:svetter:conditional_norm_flow_posrec_principle)
 
 """
 
@@ -24,7 +24,7 @@ class PosRecModel(BaseResourceReference):
     _ALIAS = "posrec_models"
     fmt = "binary"
 
-    kind: Literal["cnn", "gcn", "mlp", "s1_cnn", "flow"] = rframe.Index()
+    kind: Literal["cnn", "gcn", "mlp", "s1_cnn", "cnf"] = rframe.Index()
 
     value: str
     

xedocs-0.2.44/xedocs/schemas/corrections/implementations/relative_charge_yield.py

@@ -0,0 +1,20 @@
+"""
+# Correction: Relative charge yield
+# What is it correction: Corrected areas (cS2)
+
+# Description: Correction done to the area of cS2s in our detector. The relative charge yield corresponds to the number of electrons released by an interaction per energy. This correction helps us convert from the number of electrons observed in an S2 event to an energy.
+
+# Latest wiki reference: https://xe1t-wiki.lngs.infn.it/doku.php?id=caio:analysis:sr2:v18.5_relative_cy_map
+
+"""
+
+
+import rframe
+
+from ..base_corrections import TimeSampledCorrection
+
+
+class RelativeChargeYield(TimeSampledCorrection):
+
+    _ALIAS = "relative_charge_yield"
+    value: float

{xedocs-0.2.31 → xedocs-0.2.44}/xedocs/schemas/operations_reports/detector_operations.py

@@ -6,6 +6,8 @@ class DetectorOperations(BaseOperationsReport):
 
     _ALIAS="detector_operations"
 
-    system:Literal["CRY", "PUR", "LXePUR", "RSX", "RSX_2", "DST", "RAD", "DAQ"]
-    subject: str
-    
+    #system:Literal["CRY", "PUR", "LXePUR", "RSX", "RSX_2", "DST", "RAD", "DAQ"]
+    system: str = ""
+    label: str = ""
+    details: str = ""
+    link: str = ""

{xedocs-0.2.31 → xedocs-0.2.44}/xedocs/utils.py

@@ -134,20 +134,38 @@ class LazyFileAccessor(DataAccessor):
     def iter_path_records(self, ignore_paths=(), **labels):
         for path in self.urlpaths:
             glob_patttern = self.format_to_glob(path)
-            fs, _, fpaths = fsspec.get_fs_token_paths(glob_patttern,
-                                                   storage_options=self.storage_options)
-            pattern = path.replace(f"{fs.protocol}://", "")
+            fs, _, fpaths = fsspec.get_fs_token_paths(glob_patttern, storage_options=self.storage_options)
+
+            # Always define original_protocol
+            original_protocol = fs.protocol if fs.protocol else 'file'
+            if isinstance(original_protocol, tuple):
+                original_protocol = original_protocol[0]
+            else:
+                original_protocol = original_protocol
+
+            # Debug prints
+            # print(f"\n[DEBUG]")
+            # print(f"Processing path: {path}")
+            # print(f"fs.protocol: {fs.protocol}")
+            # print(f"Original protocol: {original_protocol}")
+            # print(f"Glob pattern: {glob_patttern}")
+            # print(f"File paths: {fpaths}")
+    
+            pattern = path.replace(f"{original_protocol}://", "")
             pattern = parse.compile(self.glob_to_format(pattern))
+    
+            # More debug prints
+            # print(f"Parse pattern: {pattern}")
+    
             loaded = set(ignore_paths)
-
+    
             for fpath in fpaths:
                 if fpath in loaded:
                     continue
                 r = pattern.parse(fpath)
                 if r is None:
                     continue
-                for k,vs in labels.items():
-                    
+                for k, vs in labels.items():
                     if vs is None:
                         continue
                     if not isinstance(vs, list):
@@ -164,10 +182,11 @@ class LazyFileAccessor(DataAccessor):
                     if label not in vs:
                         break
                 else:
-                    records = read_files(fpath, protocol=fs.protocol, **fs.storage_options)
+                    records = read_files(fpath, protocol=original_protocol, **fs.storage_options)
                     yield fpath, records
                     self.loaded.add(fpath)
 
+
     def load_files(self, **labels):
         index_fields = list(self.schema.get_index_fields())
         if len(index_fields) == 1: