rapidpe-rift-pipe 0.6.10.dev20241113__py3-none-any.whl → 0.7.1__py3-none-any.whl

rapidpe_rift_pipe/__init__.py

@@ -6,4 +6,4 @@ from . import (
     utils,
 )
 
-__version__ = "0.6.10"
+__version__ = "0.7.1"

rapidpe_rift_pipe/cli.py

@@ -72,6 +72,11 @@ _run_mode_to_channels = {
         "L1": "GDS-CALIB_STRAIN_INJ1_O3Replay",
         "V1": "Hrec_hoft_16384Hz_INJ1_O3Replay",
     },
+    "o4llpic": {
+        "H1": "GDS-CALIB_STRAIN_CLEAN_INJ1_O4Replay",
+        "L1": "GDS-CALIB_STRAIN_CLEAN_INJ1_O4Replay",
+        "V1": "Hrec_hoft_16384Hz_INJ1_O4Replay",
+    },
 }
 
 shm_basedir = "/dev/shm/kafka/"
@@ -85,6 +90,10 @@ _run_mode_to_shm_dir["o3replay"] = {
     ifo: os.path.join(shm_basedir, f"{ifo}_O3ReplayMDC")
     for ifo in ["H1", "L1", "V1"]
 }
+_run_mode_to_shm_dir["o4llpic"] = {
+    ifo: os.path.join(shm_basedir, f"{ifo}_O4LLPIC")
+    for ifo in ["H1", "L1", "V1"]
+}
 
 
 def make_parser():

rapidpe_rift_pipe/config.py

@@ -67,6 +67,7 @@ class Config:
     # Entire sections parsed as dicts
     common_event_info: dict
     integrate_likelihood_cmds_dict: dict
+    integrate_likelihood_condor_commands: dict
     create_event_dag_info: dict
     create_event_dag_condor_commands: dict
     grid_refine_info: dict
@@ -216,6 +217,11 @@ class Config:
         attrs["integrate_likelihood_cmds_dict"] = (
             convert_section_args_to_dict(cfg, "LikelihoodIntegration")
         )
+        attrs["integrate_likelihood_condor_commands"] = (
+            convert_section_args_to_dict(
+                cfg, "LikelihoodIntegration_condor_commands",
+            )
+        )
         attrs["create_event_dag_info"] = (
             convert_section_args_to_dict(cfg, "CreateEventDag")
         )

rapidpe_rift_pipe/create_submit_dag_one_event.py

@@ -164,6 +164,9 @@ def main(config, event_info=None):
         newlines += f"log = {log_dir}/integrate.log\nerror = {log_dir}/integrate.err\noutput = {log_dir}/integrate.out\n"
         newlines += "notification = never\nqueue 1\n"
 
+        for k, v in config.integrate_likelihood_condor_commands.items():
+            newlines += f"{k} = {v}"
+
         sub_file_path = os.path.join(output_dir,"integrate.sub")
         with open(sub_file_path,"w") as fo:
             fo.write(newlines)
@@ -242,6 +245,9 @@ def main(config, event_info=None):
         ## TODO: integrate into config.py
         it_0_dag_cmd += convert_dict_to_cmd_line(config.create_event_dag_info)
 
+        for k, v in config.integrate_likelihood_condor_commands.items():
+            it_0_dag_cmd += f" --condor-command {k}={v}"
+
         print(("Iteration 0 dag cmd:\n",  it_0_dag_cmd))
         exit_status = os.system(it_0_dag_cmd)
         if exit_status != 0:
@@ -301,6 +307,11 @@ def main(config, event_info=None):
         #Option added to create_event_dag to use integration.sub file which was generated for iteration 0, regenerating it is unnecessary.
         #FIXME: add this option to rapidpe_create_event_dag
         iteration_job.add_opt("condor-command","accounting_group="+config.accounting_group)
+        # HACK: glue.pipeline doesn't allow repeated add_opt calls with the same
+        #       key, because it uses a dict to store them.  Using add_arg
+        #       instead to append additional --condor-command options.
+        for k, v in config.integrate_likelihood_condor_commands.items():
+            iteration_job.add_arg(f"--condor-command {k}={v}")
         iteration_job.add_opt("accounting-group-user",config.accounting_group_user)
         if len(config.getenv) != 0:
             iteration_job.add_opt("getenv", " ".join(config.getenv))

{rapidpe_rift_pipe-0.6.10.dev20241113.dist-info → rapidpe_rift_pipe-0.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: rapidpe_rift_pipe
-Version: 0.6.10.dev20241113
+Version: 0.7.1
 Summary: Pipeline for running RapidPE and RIFT parameter estimation codes
 License: GPL-2+
 Keywords: parameter estimation,gravitational waves
@@ -20,10 +20,11 @@ Requires-Dist: matplotlib
 Requires-Dist: h5py
 Requires-Dist: tabulate
 Requires-Dist: astropy
-Requires-Dist: lalsuite !=7.15
-Requires-Dist: gwpy >=3.0.4
-Requires-Dist: rift <0.0.15.12,>=0.0.15.9
-Requires-Dist: rapid-pe <0.2.0,>=0.1.1
+Requires-Dist: lalsuite!=7.15
+Requires-Dist: gwpy>=3.0.4
+Requires-Dist: rift<0.0.15.12,>=0.0.15.9
+Requires-Dist: rapid_pe<0.2.0,>=0.1.1
+Dynamic: license-file
 
 # RapidPE/RIFT Pipeline
 

rapidpe_rift_pipe-0.7.1.dist-info/RECORD

@@ -0,0 +1,31 @@
+rapidpe_rift_pipe/__init__.py,sha256=pA1Ps0nWODErncH9_hjrmklb-bvQAzHJeYTHZDsX1Lk,101
+rapidpe_rift_pipe/cli.py,sha256=cmG3VudY3nMKLe73Wh1Y-ARbbFgcnz0XptL6ejYbDdc,48389
+rapidpe_rift_pipe/config.py,sha256=FXh5uEQeNQ_p48WulMQS78HD1sgBSeSSBUVe62ZAZn4,19095
+rapidpe_rift_pipe/create_submit_dag_one_event.py,sha256=jAKuQePF6hAJ7uhAe6enQqvA0wjLDP6wB-tl20UajAc,33756
+rapidpe_rift_pipe/jacobians.py,sha256=Lo2BBo_FWZtoWRU5KZKTrzNl_4NgPTFqXAJWOmCqOCU,2736
+rapidpe_rift_pipe/modules.py,sha256=OIpltxelL85i9pJ8dLo2QYwtM0CkhyJhy9EuPOyAyxI,9701
+rapidpe_rift_pipe/pastro.py,sha256=w5sg2DMkLFcQrSUKTXXYqBQukf3C-gu0DAVH5B3oAFQ,4198
+rapidpe_rift_pipe/postscript_utils.py,sha256=ziuHrDvN2TjqUxmVlXV3_FpNu_0J5QigA9a7uc32yl4,28898
+rapidpe_rift_pipe/profiling.py,sha256=tPXuo_Rj4MjsAgE9tOESxX-zAlWPVRKgpmOC91UnT0g,2260
+rapidpe_rift_pipe/search_bias_bounds.py,sha256=7MYxOYDZXWf1OMb8Nv8v8saeh_ArArHGBJMVj84kYUA,2412
+rapidpe_rift_pipe/test_cli.py,sha256=P-g-zH2gfFTnXUVLnoHysR46Q7QCf0OjWIDBEOcWGSA,75
+rapidpe_rift_pipe/test_config.py,sha256=jaoPxEnsHJ2Uw-mdgwb9EAAuPE8Uu9xBOP1T7SeKbtc,2064
+rapidpe_rift_pipe/test_modules.py,sha256=30hSuoNv5rarfdF28HEuD-DMKfQEVQbJx_7luocmFIU,369
+rapidpe_rift_pipe/utils.py,sha256=8h1ONp9QT0wsJdhtH3V6oeVmTY-f6WT5aeAk2Vrx7es,1087
+rapidpe_rift_pipe/config_files/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+rapidpe_rift_pipe/config_files/search_bias_bounds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+rapidpe_rift_pipe/config_files/search_bias_bounds/default.json,sha256=sIefZ0bRpUvYBFiSnPeMxk8tXdiuphLH7WsVgoJqTZM,4536
+rapidpe_rift_pipe/static/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+rapidpe_rift_pipe/static/stylesheet.css,sha256=ZNCsudHPSoQHhlGhsyp1bkiHtViGaVH_1zg-qvs4EMc,1968
+rapidpe_rift_pipe-0.7.1.data/scripts/compute_posterior.py,sha256=FBGoCKElttVCgx_81XpKm1ydx94zgi5Cm8P70Vs4sks,12762
+rapidpe_rift_pipe-0.7.1.data/scripts/convert_result_to_txt.py,sha256=CnSeppeZbG5AUGr9ZQek_jdcQ4iwVUtwyh6ZHkMFM4M,12410
+rapidpe_rift_pipe-0.7.1.data/scripts/cprofile_summary.py,sha256=pgBk_3YMwt74vL-lPWR1zS6ymXO60gNkEVRX3omadCw,6328
+rapidpe_rift_pipe-0.7.1.data/scripts/create_summarypage.py,sha256=u0lQC6UQZDayaykosDPcHj_vqxIE0F5BQOV32Ex_Rrw,6285
+rapidpe_rift_pipe-0.7.1.data/scripts/plot_skymap.py,sha256=FMytw4hSfA3tCwmkLrkL0WxEAwA1fmbmi1_8L0YcrK8,3710
+rapidpe_rift_pipe-0.7.1.dist-info/licenses/COPYING,sha256=LbAbFn5v8J3vtiXEIWfvoNr1HAYT1RG7YxRj4mabYTU,18046
+rapidpe_rift_pipe-0.7.1.dist-info/METADATA,sha256=eDLAgE3H6gbXTWS8OqAGm4N4yTWOF9UzS45rgGFC5Dw,1457
+rapidpe_rift_pipe-0.7.1.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+rapidpe_rift_pipe-0.7.1.dist-info/entry_points.txt,sha256=1W8NQSDH-atGxb-w6ySdI0s4GACHYEHFrqB-ijrykWc,65
+rapidpe_rift_pipe-0.7.1.dist-info/top_level.txt,sha256=IAUp8O4FXR8jydbZLzYvin2CWcu2fw4zsvUC8CQS0JM,18
+rapidpe_rift_pipe-0.7.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+rapidpe_rift_pipe-0.7.1.dist-info/RECORD,,

{rapidpe_rift_pipe-0.6.10.dev20241113.dist-info → rapidpe_rift_pipe-0.7.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.4.0)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

rapidpe_rift_pipe-0.6.10.dev20241113.dist-info/RECORD

@@ -1,31 +0,0 @@
-rapidpe_rift_pipe/__init__.py,sha256=1TFfHlcUj7xo-IcziCs2fTkr5KJQLZN750PUPIWDizE,102
-rapidpe_rift_pipe/cli.py,sha256=F6mxjoPw-diCW7DrwC6SdgHTLIrOqJI5vLp3pSAzZyI,48083
-rapidpe_rift_pipe/config.py,sha256=Q4FU_pZjmwyf7ClhOa3CeF6BOk3T8JoueY-1xtj0etI,18862
-rapidpe_rift_pipe/create_submit_dag_one_event.py,sha256=nmTtMZWXxNkbQPnpWG2vEfvGMHtd9BnsuLDOwwCzJVU,33152
-rapidpe_rift_pipe/jacobians.py,sha256=Lo2BBo_FWZtoWRU5KZKTrzNl_4NgPTFqXAJWOmCqOCU,2736
-rapidpe_rift_pipe/modules.py,sha256=OIpltxelL85i9pJ8dLo2QYwtM0CkhyJhy9EuPOyAyxI,9701
-rapidpe_rift_pipe/pastro.py,sha256=w5sg2DMkLFcQrSUKTXXYqBQukf3C-gu0DAVH5B3oAFQ,4198
-rapidpe_rift_pipe/postscript_utils.py,sha256=ziuHrDvN2TjqUxmVlXV3_FpNu_0J5QigA9a7uc32yl4,28898
-rapidpe_rift_pipe/profiling.py,sha256=tPXuo_Rj4MjsAgE9tOESxX-zAlWPVRKgpmOC91UnT0g,2260
-rapidpe_rift_pipe/search_bias_bounds.py,sha256=7MYxOYDZXWf1OMb8Nv8v8saeh_ArArHGBJMVj84kYUA,2412
-rapidpe_rift_pipe/test_cli.py,sha256=P-g-zH2gfFTnXUVLnoHysR46Q7QCf0OjWIDBEOcWGSA,75
-rapidpe_rift_pipe/test_config.py,sha256=jaoPxEnsHJ2Uw-mdgwb9EAAuPE8Uu9xBOP1T7SeKbtc,2064
-rapidpe_rift_pipe/test_modules.py,sha256=30hSuoNv5rarfdF28HEuD-DMKfQEVQbJx_7luocmFIU,369
-rapidpe_rift_pipe/utils.py,sha256=8h1ONp9QT0wsJdhtH3V6oeVmTY-f6WT5aeAk2Vrx7es,1087
-rapidpe_rift_pipe/config_files/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rapidpe_rift_pipe/config_files/search_bias_bounds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rapidpe_rift_pipe/config_files/search_bias_bounds/default.json,sha256=sIefZ0bRpUvYBFiSnPeMxk8tXdiuphLH7WsVgoJqTZM,4536
-rapidpe_rift_pipe/static/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rapidpe_rift_pipe/static/stylesheet.css,sha256=ZNCsudHPSoQHhlGhsyp1bkiHtViGaVH_1zg-qvs4EMc,1968
-rapidpe_rift_pipe-0.6.10.dev20241113.data/scripts/compute_posterior.py,sha256=FBGoCKElttVCgx_81XpKm1ydx94zgi5Cm8P70Vs4sks,12762
-rapidpe_rift_pipe-0.6.10.dev20241113.data/scripts/convert_result_to_txt.py,sha256=CnSeppeZbG5AUGr9ZQek_jdcQ4iwVUtwyh6ZHkMFM4M,12410
-rapidpe_rift_pipe-0.6.10.dev20241113.data/scripts/cprofile_summary.py,sha256=pgBk_3YMwt74vL-lPWR1zS6ymXO60gNkEVRX3omadCw,6328
-rapidpe_rift_pipe-0.6.10.dev20241113.data/scripts/create_summarypage.py,sha256=u0lQC6UQZDayaykosDPcHj_vqxIE0F5BQOV32Ex_Rrw,6285
-rapidpe_rift_pipe-0.6.10.dev20241113.data/scripts/plot_skymap.py,sha256=FMytw4hSfA3tCwmkLrkL0WxEAwA1fmbmi1_8L0YcrK8,3710
-rapidpe_rift_pipe-0.6.10.dev20241113.dist-info/COPYING,sha256=LbAbFn5v8J3vtiXEIWfvoNr1HAYT1RG7YxRj4mabYTU,18046
-rapidpe_rift_pipe-0.6.10.dev20241113.dist-info/METADATA,sha256=xa55c6N9wxl3ZeHluhYi9GlcfXwsL9F9venx2y_oMWY,1452
-rapidpe_rift_pipe-0.6.10.dev20241113.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
-rapidpe_rift_pipe-0.6.10.dev20241113.dist-info/entry_points.txt,sha256=1W8NQSDH-atGxb-w6ySdI0s4GACHYEHFrqB-ijrykWc,65
-rapidpe_rift_pipe-0.6.10.dev20241113.dist-info/top_level.txt,sha256=IAUp8O4FXR8jydbZLzYvin2CWcu2fw4zsvUC8CQS0JM,18
-rapidpe_rift_pipe-0.6.10.dev20241113.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-rapidpe_rift_pipe-0.6.10.dev20241113.dist-info/RECORD,,