Merge pull request #6465 from vtommasini/develop

Eccentricity Control Full Run Test

Author: nilsvu

support/Pipelines/Bbh/Inspiral.yaml

@@ -19,7 +19,7 @@ Next:
 Next:
   Run: spectre.Pipelines.Bbh.EccentricityControl:eccentricity_control
   With:
-    h5_files: ./BbhReductions.h5
+    h5_files: "../Segment_*/BbhReductions.h5"
     plot_output_dir: ./
     id_input_file_path: {{id_input_file_path }}
     pipeline_dir: {{ pipeline_dir }}

support/Pipelines/EccentricityControl/EccentricityControlParams.py

@@ -4,6 +4,7 @@
 # See LICENSE.txt for details.
 
 import functools
+import glob
 import logging
 from pathlib import Path
 from typing import Dict, Literal, Optional, Sequence, Tuple, Union
@@ -52,7 +53,7 @@ def eccentricity_control_params(
 
     Arguments:
       h5_files: Paths to the H5 files containing the trajectory data (e.g.
-        BbhReductions.h5).
+        BbhReductions.h5). Can also be a glob pattern.
       id_input_file_path: Path to the initial data input file from which the
         evolution started. This file contains the initial data parameters that
         are being controlled.
@@ -99,7 +100,9 @@ def eccentricity_control_params(
     ), "Only circular orbits are currently supported for eccentricity control."
 
     # Make sure h5_files is a sequence
-    if isinstance(h5_files, (str, Path)):
+    if isinstance(h5_files, str):
+        h5_files = glob.glob(h5_files)
+    if isinstance(h5_files, Path):
         h5_files = [h5_files]
 
     # Read initial data parameters from input file

tests/support/Pipelines/Bbh/Test_Inspiral.py

@@ -205,7 +205,7 @@ def test_cli(self):
             {
                 "Run": modulename + ":eccentricity_control",
                 "With": {
-                    "h5_files": "./BbhReductions.h5",
+                    "h5_files": "../Segment_*/BbhReductions.h5",
                     "plot_output_dir": "./",
                     "id_input_file_path": str(
                         self.id_dir.resolve() / "InitialData.yaml"

tests/support/Pipelines/EccentricityControl/Test_EccentricityControlParams.py

@@ -87,7 +87,7 @@ def tearDown(self):
 
     def test_ecc_control_params(self):
         ecc, ecc_std_dev, param_updates = eccentricity_control_params(
-            h5_files=[self.h5_filename],
+            h5_files=self.test_dir + "/TestEccentricity*.h5",
             id_input_file_path=self.id_input_file_path,
             tmin=0.0,
             tmax=1200.0,