Merge branch 'main' into dependabot/github_actions/actions/attest-build-provenance-3.2.0

ggmarshall · web-flow · commit fa7c6a0da19c · 2026-02-03T12:15:15.000-08:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.11", "3.12", "3.13"]
-        os: [ubuntu-latest, macos-13]
+        os: [ubuntu-latest, macos-14]
 
     steps:
       - uses: actions/checkout@v5
diff --git a/src/legenddataflowscripts/par/geds/dsp/dplms.py b/src/legenddataflowscripts/par/geds/dsp/dplms.py
@@ -65,7 +65,7 @@ def par_geds_dsp_dplms() -> None:
         energies = lh5.read_as(
             f"{args.raw_table_name}/daqenergy", fft_files, library="np"
         )
-        idxs = np.where(energies == 0)[0]
+        idxs = np.where(energies <= 10)[0]
         raw_fft = lh5.read(
             args.raw_table_name,
             fft_files,
diff --git a/src/legenddataflowscripts/par/geds/dsp/nopt.py b/src/legenddataflowscripts/par/geds/dsp/nopt.py
@@ -63,7 +63,7 @@ def par_geds_dsp_nopt() -> None:
         energies = lh5.read_as(
             f"{args.raw_table_name}/daqenergy", raw_files, library="np"
         )
-        idxs = np.where(energies == 0)[0]
+        idxs = np.where(energies <= 10)[0]
         tb_data = lh5.read(
             args.raw_table_name, raw_files, n_rows=opt_dict["n_events"], idx=idxs
         )

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ def par_geds_dsp_dplms() -> None:`
`65`	`65`	`energies = lh5.read_as(`
`66`	`66`	`f"{args.raw_table_name}/daqenergy", fft_files, library="np"`
`67`	`67`	`)`
`68`		`- idxs = np.where(energies == 0)[0]`
	`68`	`+ idxs = np.where(energies <= 10)[0]`
`69`	`69`	`raw_fft = lh5.read(`
`70`	`70`	`args.raw_table_name,`
`71`	`71`	`fft_files,`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ def par_geds_dsp_nopt() -> None:`
`63`	`63`	`energies = lh5.read_as(`
`64`	`64`	`f"{args.raw_table_name}/daqenergy", raw_files, library="np"`
`65`	`65`	`)`
`66`		`- idxs = np.where(energies == 0)[0]`
	`66`	`+ idxs = np.where(energies <= 10)[0]`
`67`	`67`	`tb_data = lh5.read(`
`68`	`68`	`args.raw_table_name, raw_files, n_rows=opt_dict["n_events"], idx=idxs`
`69`	`69`	`)`