lstosa 0.10.17__py3-none-any.whl → 0.10.18__py3-none-any.whl

{lstosa-0.10.17.dist-info → lstosa-0.10.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lstosa
-Version: 0.10.17
+Version: 0.10.18
 Summary: Onsite analysis pipeline for the CTA LST-1
 Author: María Láinez, José Enrique Ruiz, Lab Saha, Andrés Baquero, José Luis Contreras, Maximilian Linhoff
 Author-email: Daniel Morcuende <dmorcuen@ucm.es>
@@ -13,14 +13,13 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering :: Astronomy
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: astropy ~=5.0
-Requires-Dist: lstchain >=0.10.7
+Requires-Dist: lstchain >=0.10.13
 Requires-Dist: matplotlib
 Requires-Dist: numpy
 Requires-Dist: pandas
@@ -34,6 +33,7 @@ Requires-Dist: toml
 Requires-Dist: pymongo
 Requires-Dist: gammapy ~=1.1
 Requires-Dist: tenacity
+Requires-Dist: lstcam-calib
 Provides-Extra: all
 Requires-Dist: lstosa[dev,doc,test] ; extra == 'all'
 Provides-Extra: dev

{lstosa-0.10.17.dist-info → lstosa-0.10.18.dist-info}/RECORD

@@ -1,5 +1,5 @@
 osa/__init__.py,sha256=crotf1NMTfNdZuCua_5T_jk3kvZrAAwVw4FPrfxv994,193
-osa/_version.py,sha256=ABKJYUGMPpvTv997h6_suQBPUEllYc0-HCxNxXE2p0M,415
+osa/_version.py,sha256=r5yBgfwT0EvNlv2b1QqGkGLNXEuv3_hqkiyAYxo-zcI,415
 osa/conftest.py,sha256=NBeGqTUBRqCPirDSDPny4bf1e_OJXbiePazHwaoQPY4,20072
 osa/job.py,sha256=vl7kBRM8Oe5YK2onUWGtGmHWX0AEktS2sbOuS5fsbgU,27074
 osa/osadb.py,sha256=pkCuYbEG-moHG0uQHxwB7giQAv2XTld4HJ5gdn1F1hA,2422
@@ -12,7 +12,7 @@ osa/configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osa/configs/config.py,sha256=cX0Vr4sorBVQ2KRqPIRSEGENKH_uC5lrgVHx1hp6YTk,1148
 osa/configs/datamodel.py,sha256=L_WRM91PBlMrtuE30akh7YR-56P0g9D994qzKSfhNJc,1950
 osa/configs/options.py,sha256=CyL7WnHiC_pvB3mnjRF7Wg43uPzQgmwlbvIqkRzlDLA,524
-osa/configs/sequencer.cfg,sha256=ZHgY1GvIHkdQIg0GtR5iSNXb1C0giDObxL1SH77G1Io,4991
+osa/configs/sequencer.cfg,sha256=-iq_Eoy58JvxEuKoQ_PVr4BVS_fKY5Rmcdmluh4dJak,5118
 osa/high_level/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osa/high_level/selection_cuts.toml,sha256=ReSmcKtOPZY5JsZ9ExnxYdz7OrJEB8gghCbzHmeOyFg,128
 osa/high_level/significance.py,sha256=Y1jokkHCo-D_qSqxKiQzc6KJSmivznaJRS2xY-txNIo,9039
@@ -35,7 +35,7 @@ osa/provenance/config/environment.yaml,sha256=kPM6ucPyLZLDFzkwFWoY0C6vmAArG98U-P
 osa/provenance/config/logger.yaml,sha256=hy_lH3DfbRFh2VM_iawI-c-3wE0cjTRHy465C2eFfnQ,510
 osa/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osa/scripts/autocloser.py,sha256=Z4x4yfDA2Xkr-6ld57L4VjWcVse-sLqkGuE6ZFgSXps,14716
-osa/scripts/calibration_pipeline.py,sha256=g9o1chqCRRSo7GNuQZRABjGnJYjZyfhkPgRLPmuV994,5703
+osa/scripts/calibration_pipeline.py,sha256=aSTwxbDi-is3BSo9AVYJcV6sI4K641R1OzgdW0-ffdQ,5714
 osa/scripts/closer.py,sha256=C_80hfkkUnWMGx2YUbK1grFKUSMahpVPN8NIuSOloF0,18821
 osa/scripts/copy_datacheck.py,sha256=tfDs6oTdPbii4BOXp6bTHuED0xNJeqaPFrv6Ed7ZnWc,3104
 osa/scripts/datasequence.py,sha256=gXAp8arbLPEK-sca9VnME6-2XfUzBFIoEFchlUZYrXI,9260
@@ -50,9 +50,9 @@ osa/scripts/show_run_summary.py,sha256=SoDLVKdQHOJkfenFguBOfXf10Gyv7heXSQAFnDVZq
 osa/scripts/simulate_processing.py,sha256=NiRVYiwZENt_mnKncytgJT23_-tJMb1B5PswM12nnX4,6941
 osa/scripts/update_source_catalog.py,sha256=GHwWFc-y6S4KkUJxUVM5drdAnVDD0-n3D-Tv3CCmh4E,7218
 osa/scripts/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osa/scripts/tests/test_osa_scripts.py,sha256=POeWVOy3luhF8suC29Jk2mZNiEsECapOe2tfgwYrmco,13911
+osa/scripts/tests/test_osa_scripts.py,sha256=4R5MmTkpxmkxsG_dc1KULDvDwT7bLlF1LK2u6n0w2Qk,13919
 osa/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osa/tests/test_jobs.py,sha256=tdgZE21jisCvtlB6oAqXbV4sM1KPMG5tD-Rmcaf5OWo,15488
+osa/tests/test_jobs.py,sha256=Q5PTR2WbEElTYMnBS6kOsvD1XtuumdQGuzrTAza6TvE,15499
 osa/tests/test_osa.py,sha256=QCOsjUgPuNMHoef3Ym2sDXVjun2LaBrfKyroAIH-os8,415
 osa/tests/test_osadb.py,sha256=pJHV1dxxblGH2sjS-JPDPTkMn-ew1MzbioCFyg7wbB8,1599
 osa/tests/test_paths.py,sha256=sFCxG5uPGLcto76E7X1I26-kRx5faxgHGh9z8LvHz2M,3173
@@ -75,9 +75,9 @@ osa/workflow/dl3.py,sha256=kz7L5jcKHFJ--UdQ8HQKLzWO6nxc2LLOTz42ExcqzTk,9921
 osa/workflow/stages.py,sha256=4UkUajy4Qk-l-1la3LBDpYugK2HQEPmyUnDTBIVW0jE,7082
 osa/workflow/tests/test_dl3.py,sha256=aY5bb-8OcZGAXG3JPCZihChzkA_GsWjRIa31BHZn3Dg,299
 osa/workflow/tests/test_stages.py,sha256=TmC00XFACWZp740TQeFaokWi3C50ovj_XGiySWrrdZk,3944
-lstosa-0.10.17.dist-info/LICENSE,sha256=h6iWot11EtMvaDaS_AvCHKLTNByO5wEbMyNj1c90y1c,1519
-lstosa-0.10.17.dist-info/METADATA,sha256=JKqAqWFRR5uoCAMRGiax3RN5Mf8oZjfodbYShHxs2wM,7349
-lstosa-0.10.17.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-lstosa-0.10.17.dist-info/entry_points.txt,sha256=qfARj13Vqt3I-E0tXuJwyC79cv84bjCwEj5uK67vWts,981
-lstosa-0.10.17.dist-info/top_level.txt,sha256=_Tj8zVHdrOoWZuuWTHbDpNofxW0imUmKdlXhnxsXJek,4
-lstosa-0.10.17.dist-info/RECORD,,
+lstosa-0.10.18.dist-info/LICENSE,sha256=h6iWot11EtMvaDaS_AvCHKLTNByO5wEbMyNj1c90y1c,1519
+lstosa-0.10.18.dist-info/METADATA,sha256=l_EnECTEDP4kNeRJGYmZ376hWbzx_pyUHK4_zQf0SRA,7329
+lstosa-0.10.18.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+lstosa-0.10.18.dist-info/entry_points.txt,sha256=qfARj13Vqt3I-E0tXuJwyC79cv84bjCwEj5uK67vWts,981
+lstosa-0.10.18.dist-info/top_level.txt,sha256=_Tj8zVHdrOoWZuuWTHbDpNofxW0imUmKdlXhnxsXJek,4
+lstosa-0.10.18.dist-info/RECORD,,

osa/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.10.17'
-__version_tuple__ = version_tuple = (0, 10, 17)
+__version__ = version = '0.10.18'
+__version_tuple__ = version_tuple = (0, 10, 18)

osa/configs/sequencer.cfg

@@ -41,8 +41,10 @@ DL2_PROD_ID: model2
 
 [lstchain]
 # Calibration steps in calibration pipeline script
-drs4_baseline: onsite_create_drs4_pedestal_file
-charge_calibration: onsite_create_calibration_file
+#drs4_baseline: onsite_create_drs4_pedestal_file
+#charge_calibration: onsite_create_calibration_file
+drs4_baseline: lstcam_calib_onsite_create_drs4_pedestal_file
+charge_calibration: lstcam_calib_onsite_create_calibration_file
 use_ff_heuristic_id: False
 
 # Data processing steps in datasequence script

osa/scripts/calibration_pipeline.py

@@ -44,22 +44,23 @@ def is_calibration_produced(drs4_pedestal_run_id: int, pedcal_run_id: int) -> bo
 def drs4_pedestal_command(drs4_pedestal_run_id: int) -> list:
     """Build the create_drs4_pedestal command."""
     base_dir = Path(cfg.get("LST1", "BASE")).resolve()
+    command = cfg.get("lstchain", "drs4_baseline")
     return [
-        "onsite_create_drs4_pedestal_file",
-        f"--run_number={drs4_pedestal_run_id}",
-        f"--base_dir={base_dir}",
+        command,
+        "-r", str(drs4_pedestal_run_id),
+        "-b", base_dir,
         "--no-progress",
     ]
 
-
 def calibration_file_command(drs4_pedestal_run_id: int, pedcal_run_id: int) -> list:
     """Build the create_calibration_file command."""
     base_dir = Path(cfg.get("LST1", "BASE")).resolve()
+    command = cfg.get("lstchain", "charge_calibration")
     cmd = [
-        "onsite_create_calibration_file",
-        f"--pedestal_run={drs4_pedestal_run_id}",
-        f"--run_number={pedcal_run_id}",
-        f"--base_dir={base_dir}",
+        command,
+        "-p", str(drs4_pedestal_run_id),
+        "-r", str(pedcal_run_id),
+        "-b", base_dir,
     ]
     # In case of problems with trigger tagging:
     if cfg.getboolean("lstchain", "use_ff_heuristic_id"):

osa/scripts/tests/test_osa_scripts.py

@@ -301,9 +301,11 @@ def test_drs4_pedestal_cmd(base_test_dir):
 
     cmd = drs4_pedestal_command(drs4_pedestal_run_id="01804")
     expected_command = [
-        "onsite_create_drs4_pedestal_file",
-        "--run_number=01804",
-        f"--base_dir={base_test_dir}",
+        cfg.get("lstchain", "drs4_baseline"),
+        "-r",
+        "01804",
+        "-b",
+        base_test_dir,
         "--no-progress",
     ]
     assert cmd == expected_command
@@ -314,10 +316,13 @@ def test_calibration_file_cmd(base_test_dir):
 
     cmd = calibration_file_command(drs4_pedestal_run_id="01804", pedcal_run_id="01809")
     expected_command = [
-        "onsite_create_calibration_file",
-        "--pedestal_run=01804",
-        "--run_number=01809",
-        f"--base_dir={base_test_dir}",
+        cfg.get("lstchain", "charge_calibration"),
+        "-p",
+        "01804",
+        "-r",
+        "01809",
+        "-b",
+        base_test_dir,
     ]
     assert cmd == expected_command
 

osa/tests/test_jobs.py

@@ -395,7 +395,7 @@ def test_set_cache_dirs():
 def test_calibration_history_level():
     from osa.job import check_history_level
 
-    levels = {"onsite_create_drs4_pedestal_file": 1, "onsite_create_calibration_file": 0}
+    levels = {cfg.get("lstchain", "drs4_baseline"): 1, cfg.get("lstchain", "charge_calibration"): 0}
     level, exit_status = check_history_level(calibration_history_file, levels)
     assert level == 0
     assert exit_status == 0