PycWB 1.1.0b3__tar.gz → 1.1.0b4__tar.gz

{pycwb-1.1.0b3 → pycwb-1.1.0b4}/CHANGES.md

@@ -2,6 +2,28 @@
 
 ## Unreleased
 
+- Generate native cWB run files and shared-filesystem Condor jobs with
+  `config-setup --backend cwb`, using the configuration repository's shared
+  detector, chunk, DQ and frame metadata. Keep C profiles, plugins and injection
+  infrastructure in the external repository. Validate native templates and
+  frame paths before replacing inputs, preserve release retry/hold policies,
+  and bound worker OpenMP threads to their requested CPU allocation. Explicit
+  native setup scripts initialize workers without importing the submission
+  environment, supporting CIT's restriction on `getenv`.
+
+- Build responsive postproduction reports from YAML-configured plot groups,
+  training parameter-space diagnostics and explicit injection families.
+  Package the recorded production YAML with schema help, export PNG/SVG
+  figures, and show tested amplitude ranges and unreached efficiency thresholds
+  without extrapolation. Report resume checks track renderers and generated
+  assets; rebuilding the website can reuse existing scientific products.
+
+- Fix execution memory admission and pressure monitoring on cgroup-v2 hosts by
+  conservatively crediting reclaimable inactive file cache, preventing staged
+  frame files from unnecessarily exhausting worker budgets. Retain parent and
+  host limits, fall back conservatively when cache statistics are unavailable,
+  and distinguish process-memory ceiling failures from low available headroom.
+
 - Select CPU or CUDA XGBoost training directly with the postproduction YAML
   `device` argument. Explicit values override the configuration hook; omission
   preserves its setting or the CPU default. Reject unavailable CUDA devices,

{pycwb-1.1.0b3 → pycwb-1.1.0b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PycWB
-Version: 1.1.0b3
+Version: 1.1.0b4
 Summary: A Python package for coherent gravitational wave burst analysis
 Author-email: The PycWB team <yumeng.xu@ligo.org>
 License-Expression: GPL-3.0-or-later

{pycwb-1.1.0b3 → pycwb-1.1.0b4}/PycWB.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PycWB
-Version: 1.1.0b3
+Version: 1.1.0b4
 Summary: A Python package for coherent gravitational wave burst analysis
 Author-email: The PycWB team <yumeng.xu@ligo.org>
 License-Expression: GPL-3.0-or-later

{pycwb-1.1.0b3 → pycwb-1.1.0b4}/PycWB.egg-info/SOURCES.txt

@@ -265,17 +265,23 @@ pycwb/modules/conditioning_plugins/tests/test_noise_variation.py
 pycwb/modules/conditioning_plugins/tests/test_settings.py
 pycwb/modules/condor/__init__.py
 pycwb/modules/condor/condor.py
+pycwb/modules/condor/cwb.py
 pycwb/modules/condor/module.yaml
 pycwb/modules/condor/tests/test_condor.py
+pycwb/modules/condor/tests/test_cwb_condor.py
 pycwb/modules/config_repo_parser/README.md
 pycwb/modules/config_repo_parser/__init__.py
 pycwb/modules/config_repo_parser/composition.py
 pycwb/modules/config_repo_parser/config_repo_parser.py
+pycwb/modules/config_repo_parser/cwb.py
 pycwb/modules/config_repo_parser/module.yaml
 pycwb/modules/config_repo_parser/setup.py
+pycwb/modules/config_repo_parser/template_context.py
 pycwb/modules/config_repo_parser/tests/test_config_repo_parser.py
 pycwb/modules/config_repo_parser/tests/test_config_setup_retries.py
 pycwb/modules/config_repo_parser/tests/test_configuration_composition.py
+pycwb/modules/config_repo_parser/tests/test_cwb_config_setup_cli.py
+pycwb/modules/config_repo_parser/tests/test_cwb_setup.py
 pycwb/modules/cwb_conversions/__init__.py
 pycwb/modules/cwb_conversions/cluster.py
 pycwb/modules/cwb_conversions/detector.py
@@ -561,11 +567,18 @@ pycwb/modules/postprocess/random_filter.py
 pycwb/modules/postprocess/ranking_metrics.py
 pycwb/modules/postprocess/report.py
 pycwb/modules/postprocess/report_builder.py
+pycwb/modules/postprocess/report_bundle.py
+pycwb/modules/postprocess/report_configuration.py
 pycwb/modules/postprocess/report_context.py
+pycwb/modules/postprocess/report_overviews.py
+pycwb/modules/postprocess/report_parameter_space.py
+pycwb/modules/postprocess/report_plot_style.py
 pycwb/modules/postprocess/report_plots.py
 pycwb/modules/postprocess/report_render.py
 pycwb/modules/postprocess/report_sections.py
+pycwb/modules/postprocess/report_sensitivity.py
 pycwb/modules/postprocess/report_summaries.py
+pycwb/modules/postprocess/report_waveforms.py
 pycwb/modules/postprocess/resume_contracts.py
 pycwb/modules/postprocess/root_adapter.py
 pycwb/modules/postprocess/root_simulation.py
@@ -578,7 +591,9 @@ pycwb/modules/postprocess/training_report.py
 pycwb/modules/postprocess/waveform_report.py
 pycwb/modules/postprocess/xgb_heatmap.py
 pycwb/modules/postprocess/zero_lag.py
+pycwb/modules/postprocess/templates/1_ridgeline_banner.svg
 pycwb/modules/postprocess/templates/postproduction_report.html.j2
+pycwb/modules/postprocess/templates/production_configuration.html.j2
 pycwb/modules/postprocess/tests/__init__.py
 pycwb/modules/postprocess/tests/test_action_documentation.py
 pycwb/modules/postprocess/tests/test_action_resume.py
@@ -591,13 +606,24 @@ pycwb/modules/postprocess/tests/test_efficiency_reference_contract.py
 pycwb/modules/postprocess/tests/test_efficiency_scored_ranking.py
 pycwb/modules/postprocess/tests/test_far_ranking_contract.py
 pycwb/modules/postprocess/tests/test_far_ties.py
+pycwb/modules/postprocess/tests/test_foreground_plots.py
 pycwb/modules/postprocess/tests/test_ifar_duration.py
 pycwb/modules/postprocess/tests/test_matching.py
 pycwb/modules/postprocess/tests/test_matching_cli.py
 pycwb/modules/postprocess/tests/test_pipeline_performance.py
 pycwb/modules/postprocess/tests/test_postproduction_report.py
 pycwb/modules/postprocess/tests/test_report.py
+pycwb/modules/postprocess/tests/test_report_background_density.py
+pycwb/modules/postprocess/tests/test_report_bundle.py
+pycwb/modules/postprocess/tests/test_report_bundle_resume.py
+pycwb/modules/postprocess/tests/test_report_configuration.py
+pycwb/modules/postprocess/tests/test_report_overviews.py
+pycwb/modules/postprocess/tests/test_report_paths.py
+pycwb/modules/postprocess/tests/test_report_plot_layout.py
+pycwb/modules/postprocess/tests/test_report_sensitivity.py
 pycwb/modules/postprocess/tests/test_report_streaming_reductions.py
+pycwb/modules/postprocess/tests/test_report_training_space.py
+pycwb/modules/postprocess/tests/test_report_waveforms.py
 pycwb/modules/postprocess/tests/test_resume.py
 pycwb/modules/postprocess/tests/test_review_regressions.py
 pycwb/modules/postprocess/tests/test_root_adapter.py
@@ -612,6 +638,7 @@ pycwb/modules/postprocess/tests/test_selection_progress_invariants.py
 pycwb/modules/postprocess/tests/test_simulation_summary_cli.py
 pycwb/modules/postprocess/tests/test_training_report_roundtrip.py
 pycwb/modules/postprocess/tests/test_workflow_config.py
+pycwb/modules/postprocess/tests/test_workflow_presets.py
 pycwb/modules/postprocess/tests/test_xgb_bulk_boundaries.py
 pycwb/modules/postprocess/tests/test_xgb_catalog_features.py
 pycwb/modules/postprocess/tests/test_xgb_heatmap_portability.py
@@ -737,6 +764,7 @@ pycwb/modules/xtalk/tests/test_monster.py
 pycwb/post_production/__init__.py
 pycwb/post_production/action_spec.py
 pycwb/post_production/diagram.py
+pycwb/post_production/presets.py
 pycwb/post_production/resume.py
 pycwb/post_production/workflow.py
 pycwb/post_production/workflow_config.py
@@ -864,6 +892,7 @@ pycwb/workflow/execution/tests/test_gpu_adapter.py
 pycwb/workflow/execution/tests/test_gpu_pipeline.py
 pycwb/workflow/execution/tests/test_historical_analysis_guard.py
 pycwb/workflow/execution/tests/test_integration.py
+pycwb/workflow/execution/tests/test_memory_accounting.py
 pycwb/workflow/execution/tests/test_variability.py
 pycwb/workflow/subflow/__init__.py
 pycwb/workflow/subflow/gpu_output.py

{pycwb-1.1.0b3 → pycwb-1.1.0b4}/PycWB.egg-info/scm_file_list.json

@@ -417,6 +417,16 @@
     "examples/online_shm_run/user_parameters_debug.yaml",
     "examples/performance/README.md",
     "examples/performance/bounded_cpu.yaml",
+    "examples/postproduction/k21_presets/README.txt",
+    "examples/postproduction/k21_presets/examples/page_overrides.yaml",
+    "examples/postproduction/k21_presets/inputs/stdinjs_set2_run5_families.json",
+    "examples/postproduction/k21_presets/pp_K21_run4bkg_run3train_run5stdinj.presets.yaml",
+    "examples/postproduction/k21_presets/presets/background.yaml",
+    "examples/postproduction/k21_presets/presets/foreground_figures.yaml",
+    "examples/postproduction/k21_presets/presets/simulation_cbc.yaml",
+    "examples/postproduction/k21_presets/presets/simulation_standard.yaml",
+    "examples/postproduction/k21_presets/presets/training_burst.yaml",
+    "examples/postproduction/k21_presets/run_after_implementation.sh",
     "examples/postproduction/standard_analysis_10pct_workflow.yaml",
     "examples/postproduction/waveform_reconstruction_workflow.yaml",
     "examples/pycwb_cwb_consistency/README.md",
@@ -647,17 +657,23 @@
     "pycwb/modules/conditioning_plugins/tests/test_settings.py",
     "pycwb/modules/condor/__init__.py",
     "pycwb/modules/condor/condor.py",
+    "pycwb/modules/condor/cwb.py",
     "pycwb/modules/condor/module.yaml",
     "pycwb/modules/condor/tests/test_condor.py",
+    "pycwb/modules/condor/tests/test_cwb_condor.py",
     "pycwb/modules/config_repo_parser/README.md",
     "pycwb/modules/config_repo_parser/__init__.py",
     "pycwb/modules/config_repo_parser/composition.py",
     "pycwb/modules/config_repo_parser/config_repo_parser.py",
+    "pycwb/modules/config_repo_parser/cwb.py",
     "pycwb/modules/config_repo_parser/module.yaml",
     "pycwb/modules/config_repo_parser/setup.py",
+    "pycwb/modules/config_repo_parser/template_context.py",
     "pycwb/modules/config_repo_parser/tests/test_config_repo_parser.py",
     "pycwb/modules/config_repo_parser/tests/test_config_setup_retries.py",
     "pycwb/modules/config_repo_parser/tests/test_configuration_composition.py",
+    "pycwb/modules/config_repo_parser/tests/test_cwb_config_setup_cli.py",
+    "pycwb/modules/config_repo_parser/tests/test_cwb_setup.py",
     "pycwb/modules/cwb_conversions/__init__.py",
     "pycwb/modules/cwb_conversions/cluster.py",
     "pycwb/modules/cwb_conversions/detector.py",
@@ -945,11 +961,18 @@
     "pycwb/modules/postprocess/ranking_metrics.py",
     "pycwb/modules/postprocess/report.py",
     "pycwb/modules/postprocess/report_builder.py",
+    "pycwb/modules/postprocess/report_bundle.py",
+    "pycwb/modules/postprocess/report_configuration.py",
     "pycwb/modules/postprocess/report_context.py",
+    "pycwb/modules/postprocess/report_overviews.py",
+    "pycwb/modules/postprocess/report_parameter_space.py",
+    "pycwb/modules/postprocess/report_plot_style.py",
     "pycwb/modules/postprocess/report_plots.py",
     "pycwb/modules/postprocess/report_render.py",
     "pycwb/modules/postprocess/report_sections.py",
+    "pycwb/modules/postprocess/report_sensitivity.py",
     "pycwb/modules/postprocess/report_summaries.py",
+    "pycwb/modules/postprocess/report_waveforms.py",
     "pycwb/modules/postprocess/resume_contracts.py",
     "pycwb/modules/postprocess/root_adapter.py",
     "pycwb/modules/postprocess/root_simulation.py",
@@ -957,7 +980,9 @@
     "pycwb/modules/postprocess/selection_duckdb.py",
     "pycwb/modules/postprocess/selection_duckdb_membership.py",
     "pycwb/modules/postprocess/simulation_report.py",
+    "pycwb/modules/postprocess/templates/1_ridgeline_banner.svg",
     "pycwb/modules/postprocess/templates/postproduction_report.html.j2",
+    "pycwb/modules/postprocess/templates/production_configuration.html.j2",
     "pycwb/modules/postprocess/tests/__init__.py",
     "pycwb/modules/postprocess/tests/test_action_documentation.py",
     "pycwb/modules/postprocess/tests/test_action_resume.py",
@@ -970,13 +995,24 @@
     "pycwb/modules/postprocess/tests/test_efficiency_scored_ranking.py",
     "pycwb/modules/postprocess/tests/test_far_ranking_contract.py",
     "pycwb/modules/postprocess/tests/test_far_ties.py",
+    "pycwb/modules/postprocess/tests/test_foreground_plots.py",
     "pycwb/modules/postprocess/tests/test_ifar_duration.py",
     "pycwb/modules/postprocess/tests/test_matching.py",
     "pycwb/modules/postprocess/tests/test_matching_cli.py",
     "pycwb/modules/postprocess/tests/test_pipeline_performance.py",
     "pycwb/modules/postprocess/tests/test_postproduction_report.py",
     "pycwb/modules/postprocess/tests/test_report.py",
+    "pycwb/modules/postprocess/tests/test_report_background_density.py",
+    "pycwb/modules/postprocess/tests/test_report_bundle.py",
+    "pycwb/modules/postprocess/tests/test_report_bundle_resume.py",
+    "pycwb/modules/postprocess/tests/test_report_configuration.py",
+    "pycwb/modules/postprocess/tests/test_report_overviews.py",
+    "pycwb/modules/postprocess/tests/test_report_paths.py",
+    "pycwb/modules/postprocess/tests/test_report_plot_layout.py",
+    "pycwb/modules/postprocess/tests/test_report_sensitivity.py",
     "pycwb/modules/postprocess/tests/test_report_streaming_reductions.py",
+    "pycwb/modules/postprocess/tests/test_report_training_space.py",
+    "pycwb/modules/postprocess/tests/test_report_waveforms.py",
     "pycwb/modules/postprocess/tests/test_resume.py",
     "pycwb/modules/postprocess/tests/test_review_regressions.py",
     "pycwb/modules/postprocess/tests/test_root_adapter.py",
@@ -991,6 +1027,7 @@
     "pycwb/modules/postprocess/tests/test_simulation_summary_cli.py",
     "pycwb/modules/postprocess/tests/test_training_report_roundtrip.py",
     "pycwb/modules/postprocess/tests/test_workflow_config.py",
+    "pycwb/modules/postprocess/tests/test_workflow_presets.py",
     "pycwb/modules/postprocess/tests/test_xgb_bulk_boundaries.py",
     "pycwb/modules/postprocess/tests/test_xgb_catalog_features.py",
     "pycwb/modules/postprocess/tests/test_xgb_heatmap_portability.py",
@@ -1122,6 +1159,7 @@
     "pycwb/post_production/__init__.py",
     "pycwb/post_production/action_spec.py",
     "pycwb/post_production/diagram.py",
+    "pycwb/post_production/presets.py",
     "pycwb/post_production/resume.py",
     "pycwb/post_production/workflow.py",
     "pycwb/post_production/workflow_config.py",
@@ -1243,6 +1281,7 @@
     "pycwb/workflow/execution/tests/test_gpu_pipeline.py",
     "pycwb/workflow/execution/tests/test_historical_analysis_guard.py",
     "pycwb/workflow/execution/tests/test_integration.py",
+    "pycwb/workflow/execution/tests/test_memory_accounting.py",
     "pycwb/workflow/execution/tests/test_variability.py",
     "pycwb/workflow/execution/writer.py",
     "pycwb/workflow/merge.py",

pycwb-1.1.0b4/PycWB.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.1.0b4",
+  "distance": 0,
+  "node": "gcf49c5a61337182a2bdbe3c17a3000a5d5c408bd",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-10-12"
+}

{pycwb-1.1.0b3 → pycwb-1.1.0b4}/pycwb/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.1.0b3'
-__version_tuple__ = version_tuple = (1, 1, 0, 'b3')
+__version__ = version = '1.1.0b4'
+__version_tuple__ = version_tuple = (1, 1, 0, 'b4')
 
-__commit_id__ = commit_id = 'ga49b48cb9'
+__commit_id__ = commit_id = 'gcf49c5a61'

{pycwb-1.1.0b3 → pycwb-1.1.0b4}/pycwb/cli/config_setup.py

@@ -18,6 +18,17 @@ def init_parser(parser):
                         metavar='workdir',
                         type=str,
                         help='Working directory name (will be created), e.g., O4_K02_C00_BurstLF_LH_BKG_standard')
+    parser.add_argument('--backend', choices=['pycwb', 'cwb'], default='pycwb',
+                        help='Render PycWB YAML or native cWB C templates (default: pycwb)')
+    parser.add_argument('--config-only', action='store_true',
+                        help='Generate the run directory without preparing batch jobs; '
+                             'useful when cWB runs on another machine')
+    parser.add_argument('--condor-only', action='store_true',
+                        help='Prepare Condor files for an existing generated cWB run, '
+                             'without regenerating its configuration or inputs')
+    parser.add_argument('--machine-file', metavar='machine_file', default=None,
+                        help='Native host settings YAML for --condor-only; defaults to '
+                             'WORKDIR/config/machine.yaml')
     
     # Data type
     parser.add_argument('--datatype',
@@ -142,21 +153,40 @@ def init_parser(parser):
 def command(args):
     """Execute the config-setup command."""
     from pycwb.modules.config_repo_parser import setup_project
-    from pycwb.workflow.batch import batch_setup as batch_setup_func
     
     logging.basicConfig(level=logging.INFO)
     
     try:
-        # Step 1: Setup the project directory
-        logger.info(f"Setting up project: {args.workdir}")
-        
-        setup_result = setup_project(
-            work_dir=args.workdir,
-            config_base_path=args.config_base_path,
-            machine=args.machine,
-            data_type=args.datatype,
-            dry_run=args.dry_run
-        )
+        if args.condor_only:
+            if args.backend != 'cwb':
+                raise ValueError('--condor-only requires --backend cwb')
+            if args.config_only or args.machine is not None or args.datatype is not None:
+                raise ValueError('--condor-only cannot be combined with --config-only, '
+                                 '--machine or --datatype; use --machine-file for host settings')
+            from pathlib import Path
+            from pycwb.modules.config_repo_parser.cwb import load_cwb_run_settings
+            work_path = Path(args.workdir).resolve()
+            settings = load_cwb_run_settings(work_path, args.machine_file)
+            setup_result = {
+                'work_dir': work_path,
+                'config_file': work_path / 'config/user_parameters.C',
+                'machine_settings': settings,
+                'parsed': {'path': settings['cwb_profile']},
+            }
+        else:
+            if args.machine_file is not None:
+                raise ValueError('--machine-file requires --condor-only; use --machine '
+                                 'to select a repository profile when generating a run')
+            logger.info(f"Setting up project: {args.workdir}")
+            setup_result = setup_project(
+                work_dir=args.workdir,
+                config_base_path=args.config_base_path,
+                machine=args.machine,
+                data_type=args.datatype,
+                dry_run=args.dry_run,
+                backend=args.backend,
+                overwrite=args.force_overwrite
+            )
         
         if args.dry_run:
             logger.info("Dry run completed. No files were created.")
@@ -164,11 +194,36 @@ def command(args):
         
         logger.info(f"Project setup complete at: {setup_result['work_dir']}")
         logger.info(f"  Config file: {setup_result['config_file']}")
-        logger.info(f"  Data type: {setup_result['data_type']}")
-        logger.info(f"  GPS time: {setup_result['gps_times']['start']} - {setup_result['gps_times']['stop']}")
+        if not args.condor_only:
+            logger.info(f"  Data type: {setup_result['data_type']}")
+            logger.info(f"  GPS time: {setup_result['gps_times']['start']} - {setup_result['gps_times']['stop']}")
+
+        if args.config_only:
+            return 0
+
+        if args.backend == 'cwb':
+            from pycwb.modules.condor.cwb import cwb_batch_setup
+            if args.walltime or args.slurm_constraint or args.slurm_partition:
+                raise ValueError('Native cWB batch setup uses Condor; SLURM options are unsupported.')
+            if 'XGB' in setup_result['parsed']['path'].split('/'):
+                raise ValueError('CWB XGB is a postprocessing profile. Use --config-only '
+                                 'and the native cwb_xgboost workflow on merged results.')
+            jobs = cwb_batch_setup(
+                working_dir=str(setup_result['work_dir']),
+                machine_settings=setup_result['machine_settings'],
+                cluster=args.cluster, n_proc=args.n_proc, memory=args.memory,
+                disk=args.disk, accounting_group=args.accounting_group,
+                container_image=args.container_image, n_retries=args.n_retries,
+                submit=args.submit, list_n_jobs=args.list_n_jobs,
+                overwrite=args.force_overwrite,
+            )
+            if args.list_n_jobs:
+                logger.info('Number of cWB jobs: %d', len(jobs))
+            return 0
         
         # Step 2: Run batch setup to prepare for job submission
         config_file = str(setup_result['config_file'])
+        from pycwb.workflow.batch import batch_setup as batch_setup_func
         
         if args.list_n_jobs:
             # Just list the number of jobs

{pycwb-1.1.0b3 → pycwb-1.1.0b4}/pycwb/modules/condor/condor.py

@@ -4,6 +4,7 @@ import shutil
 from pycwb.utils.size import byte_size
 import socket
 import click
+import getpass
 
 
 class HTCondor:
@@ -140,38 +141,69 @@ pycwb simulation-summary {working_dir}/config/user_parameters.yaml --work-dir={w
 
         os.chmod(f"{dag_dir}/simulation_summary.sh", 0o755)
 
+    def _job_submit_config(self, script, label, *, n_proc=None, arguments=None):
+        """Common submit settings for both PycWB and native cWB workers."""
+        config = {
+            "universe": "vanilla",
+            "initialdir": self.working_dir,
+            "executable": os.path.join(self.dag_dir, script),
+            "should_transfer_files": "no",
+            "output": f"log/{label}.out",
+            "error": f"log/{label}.err",
+            "log": f"log/{label}.log",
+            "accounting_group": self.accounting_group,
+            "accounting_group_user": getpass.getuser(),
+            "request_cpus": str(self.n_proc if n_proc is None else n_proc),
+            "request_memory": self.memory,
+            "request_disk": self.disk,
+            "use_oauth_services": "scitokens",
+            "environment": "BEARER_TOKEN_FILE=$$(CondorScratchDir)/.condor_creds/scitokens.use",
+        }
+        if arguments is not None:
+            config["arguments"] = arguments
+        return config
+
+    def _configure_submit_descriptions(self, descriptions):
+        """Apply machine placement and container requirements consistently."""
+        hostname = socket.gethostname().split(".", 1)[0].lower()
+        for config in descriptions:
+            if (
+                self.conda_env
+                and not self.container_image
+                and re.fullmatch(r"(?:citlogin[0-9]+|ldas-grid|ldas-pcdev[0-9]+)", hostname)
+            ):
+                config["MY.flock_local"] = True
+                config["MY.DESIRED_Sites"] = "none"
+                config["requirements"] = "(TARGET.EPNFS =?= True)"
+            if self.container_image:
+                config["universe"] = "container"
+                config["container_image"] = self.container_image
+            requirements = [config.get("requirements", ""), self.requirements]
+            if self.container_image and self.container_image.endswith(".sif"):
+                requirements.append("(TARGET.HAS_SINGULARITY =?= True) && (TARGET.SINGULARITY_CAN_USE_SIF =?= True)")
+            if any(requirements):
+                config["requirements"] = " && ".join(f"({item})" for item in requirements if item)
+
+    def _write_submit_descriptions(self, descriptions):
+        # htcondor2 versions differ on whether str(Submit) includes queue.
+        for name, description in descriptions:
+            with open(os.path.join(self.dag_dir, f"{name}.sub"), "w") as stream:
+                stream.write("".join(f"{key} = {value}\n" for key, value in description.items()))
+                stream.write("queue\n")
+
     def generate_condor_dag(self, job_segments, has_simulations=False):
-        import getpass
         import htcondor2 as htcondor
         from htcondor2 import dags
         
         working_dir = self.working_dir
         dag_dir = self.dag_dir
-        accounting_group = self.accounting_group
         job_per_worker = self.job_per_worker
-        container_image = self.container_image
         should_transfer_files = self.should_transfer_files
 
         os.makedirs(dag_dir, exist_ok=True)
 
         # create the submit description for the batch job
-        batch_job_config = {
-            "universe": "vanilla",
-            "initialdir": working_dir,
-            "executable": os.path.join(dag_dir, "run.sh"),
-            "arguments": "$(jobs)",  # Passing jobs as an argument
-            "should_transfer_files": "no",
-            "output": "log/batch-$(jobs).out",
-            "error": "log/batch-$(jobs).err",
-            "log": "log/batch-$(jobs).log",
-            "accounting_group": accounting_group,
-            "accounting_group_user": getpass.getuser(),
-            "request_cpus": f"{self.n_proc}",
-            "request_memory": self.memory,
-            "request_disk": self.disk,
-            "use_oauth_services": "scitokens",
-            "environment": "BEARER_TOKEN_FILE=$$(CondorScratchDir)/.condor_creds/scitokens.use",
-        }
+        batch_job_config = self._job_submit_config("run.sh", "batch-$(jobs)", arguments="$(jobs)")
 
         if self.gpus:
             batch_job_config["request_gpus"] = str(self.gpus)
@@ -180,65 +212,11 @@ pycwb simulation-summary {working_dir}/config/user_parameters.yaml --work-dir={w
             for key in ("arguments", "output", "error", "log"):
                 batch_job_config[key] = batch_job_config[key].replace("$(jobs)", "$(batch_id)")
 
-        merge_job_config = {
-            "universe": "vanilla",
-            "initialdir": working_dir,
-            "executable": os.path.join(dag_dir, "merge.sh"),
-            "should_transfer_files": "no",
-            "log": "log/merge.log",
-            "output": "log/merge.out",
-            "error": "log/merge.err",
-            "accounting_group": accounting_group,
-            "accounting_group_user": getpass.getuser(),
-            "request_cpus": f"{self.n_proc}",
-            "request_memory": self.memory,
-            "request_disk": self.disk,
-            "use_oauth_services": "scitokens",
-            "environment": "BEARER_TOKEN_FILE=$$(CondorScratchDir)/.condor_creds/scitokens.use",
-        }
-
-        # Simulation summary job: lightweight, no file transfer needed — runs in
-        # parallel with the analysis jobs using only the shared filesystem config.
-        sim_summary_job_config = {
-            "universe": "vanilla",
-            "initialdir": working_dir,
-            "executable": os.path.join(dag_dir, "simulation_summary.sh"),
-            "should_transfer_files": "no",
-            "log": "log/simulation_summary.log",
-            "output": "log/simulation_summary.out",
-            "error": "log/simulation_summary.err",
-            "accounting_group": accounting_group,
-            "accounting_group_user": getpass.getuser(),
-            "request_cpus": "1",
-            "request_memory": self.memory,
-            "request_disk": self.disk,
-            "use_oauth_services": "scitokens",
-            "environment": "BEARER_TOKEN_FILE=$$(CondorScratchDir)/.condor_creds/scitokens.use",
-        }
-
-        if self.conda_env:
-            # These scheduling options are specific to the LIGO cluster.
-            hostname = socket.gethostname().split(".", 1)[0].lower()
-            if re.fullmatch(r"(?:citlogin[0-9]+|ldas-grid|ldas-pcdev[0-9]+)", hostname):
-                for job_config in (batch_job_config, merge_job_config, sim_summary_job_config):
-                    job_config["MY.flock_local"] = True
-                    job_config["MY.DESIRED_Sites"] = "none"
-                    job_config["requirements"] = "(TARGET.EPNFS =?= True)"
+        merge_job_config = self._job_submit_config("merge.sh", "merge")
 
-        if container_image:
-            batch_job_config['universe'] = 'container'
-            batch_job_config['container_image'] = container_image
-            merge_job_config['universe'] = 'container'
-            merge_job_config['container_image'] = container_image
-            sim_summary_job_config['universe'] = 'container'
-            sim_summary_job_config['container_image'] = container_image
-
-        for job_config in (batch_job_config, merge_job_config, sim_summary_job_config):
-            requirements = [job_config.get("requirements", ""), self.requirements]
-            if container_image and container_image.endswith(".sif"):
-                requirements.append("(TARGET.HAS_SINGULARITY =?= True) && (TARGET.SINGULARITY_CAN_USE_SIF =?= True)")
-            if any(requirements):
-                job_config["requirements"] = " && ".join(f"({item})" for item in requirements if item)
+        # Simulation summary runs in parallel with the analysis jobs.
+        sim_summary_job_config = self._job_submit_config("simulation_summary.sh", "simulation_summary", n_proc=1)
+        self._configure_submit_descriptions((batch_job_config, merge_job_config, sim_summary_job_config))
 
         if should_transfer_files:
             # Transfer only this job's own catalog and progress fragments.
@@ -394,16 +372,16 @@ pycwb simulation-summary {working_dir}/config/user_parameters.yaml --work-dir={w
         descriptions = [("pycwb_batch", batch_job), ("merge", merge_job)]
         if sim_summary_job is not None:
             descriptions.append(("simulation_summary", sim_summary_job))
-        for name, description in descriptions:
-            with open(os.path.join(dag_dir, f"{name}.sub"), "w") as stream:
-                stream.write("".join(f"{key} = {value}\n" for key, value in description.items()))
-                stream.write("queue\n")
+        self._write_submit_descriptions(descriptions)
 
         print(f'DAG directory: {dag_dir}')
         print(f'DAG description file: {dag_file}')
 
         self.dag_file = dag_file
 
+    def _dag_submit_options(self):
+        return {"force": 1, "import_env": 0}
+
     def submit_condor_dag(self):
         import htcondor2 as htcondor
 
@@ -412,7 +390,7 @@ pycwb simulation-summary {working_dir}/config/user_parameters.yaml --work-dir={w
 
         # CONFIG paths are relative to the submission directory.
         os.chdir(dag_dir)
-        dag_submit = htcondor.Submit.from_dag(str(self.dag_file), {'force': 1, 'import_env': 0})
+        dag_submit = htcondor.Submit.from_dag(str(self.dag_file), self._dag_submit_options())
         print('------------------------')
         print(dag_submit)
         print('------------------------')