From a41a7c8448f673baaeebf8e8d639a944a2d96ed6 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 18 Mar 2025 11:21:26 -0700 Subject: [PATCH 1/2] Examples: Default openPMD Backend We default to ADIOS2 output when available for performance in the I/O of our `BeamMonitor` element. For CI and correctness tests, because sometimes it is easier/faster to install from packages (e.g., Debian), we hard-code the HDF5 openPMD backend, to avoid that the test behaves differently if ADIOS2 is present (switches to bp) or not (switches to h5). Now, we can actually let the code switch automatically because with openPMD 0.16+, we have a generic pattern `.%E` in analsy scripts to read the written files and match the first openPMD backend that works (by file name extension). That way, we can now simplify our examples by not adding the extra lines to control the openPMD backend anymore. --- docs/source/dataanalysis/dataanalysis.rst | 2 +- examples/achromatic_spectrometer/analysis_spectrometer.py | 2 +- examples/achromatic_spectrometer/input_spectrometer.in | 1 - examples/achromatic_spectrometer/run_spectrometer.py | 2 +- examples/alignment/analysis_alignment.py | 2 +- examples/alignment/input_alignment.in | 1 - examples/alignment/run_alignment.py | 2 +- examples/aperture/analysis_absorber.py | 4 ++-- examples/aperture/analysis_aperture.py | 4 ++-- examples/aperture/analysis_aperture_periodic.py | 4 ++-- examples/aperture/analysis_aperture_thick.py | 4 ++-- examples/aperture/input_absorber.in | 1 - examples/aperture/input_aperture.in | 1 - examples/aperture/input_aperture_periodic.in | 1 - examples/aperture/input_aperture_thick.in | 1 - examples/aperture/run_absorber.py | 3 +-- examples/aperture/run_aperture.py | 3 +-- examples/aperture/run_aperture_periodic.py | 3 +-- examples/aperture/run_aperture_thick.py | 3 +-- examples/apochromatic/analysis_apochromatic.py | 2 +- examples/apochromatic/analysis_apochromatic_pl.py | 2 +- examples/apochromatic/input_apochromatic.in | 1 - examples/apochromatic/input_apochromatic_pl.in | 1 - examples/apochromatic/run_apochromatic.py | 2 +- examples/apochromatic/run_apochromatic_pl.py | 2 +- examples/cfbend/analysis_cfbend.py | 2 +- examples/cfbend/input_cfbend.in | 1 - examples/cfbend/run_cfbend.py | 2 +- examples/cfchannel/analysis_cfchannel.py | 2 +- examples/cfchannel/analysis_cfchannel_10nC.py | 2 +- examples/cfchannel/input_cfchannel.in | 1 - examples/cfchannel/input_cfchannel_10nC_fft.in | 1 - examples/cfchannel/input_cfchannel_10nC_mlmg.in | 1 - examples/cfchannel/run_cfchannel.py | 2 +- examples/cfchannel/run_cfchannel_10nC_fft.py | 2 +- examples/cfchannel/run_cfchannel_10nC_mlmg.py | 2 +- examples/chicane/analysis_chicane.py | 2 +- examples/chicane/analysis_chicane_csr.py | 2 +- examples/chicane/input_chicane.in | 1 - examples/chicane/input_chicane_csr.in | 1 - examples/chicane/plot_chicane.py | 2 +- examples/chicane/run_chicane.py | 2 +- examples/chicane/run_chicane_csr.py | 2 +- examples/compression/analysis_compression.py | 2 +- examples/compression/input_compression.in | 1 - examples/compression/run_compression.py | 2 +- examples/coupled_optics/analysis_coupled_optics.py | 2 +- examples/coupled_optics/input_coupled_optics.in | 1 - examples/coupled_optics/run_coupled_optics.py | 2 +- examples/cyclotron/analysis_cyclotron.py | 2 +- examples/cyclotron/analysis_cyclotron_loss.py | 2 +- examples/cyclotron/input_cyclotron.in | 1 - examples/cyclotron/input_cyclotron_loss.in | 1 - examples/cyclotron/run_cyclotron.py | 2 +- examples/cyclotron/run_cyclotron_loss.py | 3 +-- examples/distgen/analysis_gaussian.py | 2 +- examples/distgen/analysis_kurth4d.py | 2 +- examples/distgen/analysis_kvdist.py | 2 +- examples/distgen/analysis_semigaussian.py | 2 +- examples/distgen/input_gaussian_twiss.in | 1 - examples/distgen/input_kurth4d.in | 1 - examples/distgen/input_kvdist_twiss.in | 1 - examples/distgen/input_semigaussian.in | 1 - examples/distgen/run_gaussian_twiss.py | 2 +- examples/distgen/run_kurth4d.py | 2 +- examples/distgen/run_kvdist_twiss.py | 2 +- examples/distgen/run_semigaussian.py | 2 +- examples/dogleg/analysis_dogleg.py | 2 +- examples/dogleg/input_dogleg.in | 1 - examples/dogleg/run_dogleg.py | 2 +- examples/epac2004_benchmarks/analysis_bithermal.py | 2 +- examples/epac2004_benchmarks/analysis_fodo_rf_SC.py | 2 +- examples/epac2004_benchmarks/analysis_thermal.py | 2 +- examples/epac2004_benchmarks/input_bithermal.in | 1 - examples/epac2004_benchmarks/input_fodo_rf_SC.in | 1 - examples/epac2004_benchmarks/input_fodo_rf_SC_envelope.in | 1 - examples/epac2004_benchmarks/input_thermal.in | 1 - examples/epac2004_benchmarks/plot_bithermal.py | 2 +- examples/epac2004_benchmarks/run_bithermal.py | 2 +- examples/epac2004_benchmarks/run_fodo_rf_SC.py | 2 +- examples/epac2004_benchmarks/run_fodo_rf_SC_envelope.py | 2 +- examples/epac2004_benchmarks/run_thermal.py | 2 +- examples/expanding_beam/analysis_expanding.py | 2 +- examples/expanding_beam/input_expanding_envelope.in | 1 - examples/expanding_beam/input_expanding_fft.in | 1 - examples/expanding_beam/input_expanding_mlmg.in | 1 - examples/expanding_beam/run_expanding_envelope.py | 2 +- examples/expanding_beam/run_expanding_fft.py | 2 +- examples/expanding_beam/run_expanding_mlmg.py | 2 +- examples/fodo/analysis_fodo.py | 2 +- examples/fodo/input_fodo.in | 1 - examples/fodo/input_fodo_envelope.in | 1 - examples/fodo/input_fodo_twiss.in | 1 - examples/fodo/plot_fodo.py | 2 +- examples/fodo/run_fodo.py | 2 +- examples/fodo/run_fodo_envelope.py | 2 +- examples/fodo/run_fodo_twiss.py | 2 +- examples/fodo_channel/analysis_fodo.py | 2 +- examples/fodo_channel/input_fodo.in | 1 - examples/fodo_channel/plot_fodo.py | 2 +- examples/fodo_channel/run_fodo.py | 2 +- examples/fodo_chromatic/analysis_fodo_chr.py | 2 +- examples/fodo_chromatic/input_fodo_chr.in | 1 - examples/fodo_chromatic/run_fodo_chr.py | 2 +- examples/fodo_programmable/run_fodo_programmable.py | 2 +- examples/fodo_rf/analysis_fodo_rf.py | 2 +- examples/fodo_rf/input_fodo_rf.in | 1 - examples/fodo_rf/run_fodo_rf.py | 2 +- examples/fodo_space_charge/input_fodo_envelope_sc.in | 1 - examples/fodo_space_charge/run_fodo_envelope_sc.py | 2 +- examples/fodo_tune/analysis_fodo_tune.py | 2 +- examples/fodo_tune/input_fodo_tune.in | 1 - examples/fodo_tune/run_fodo_tune.py | 2 +- examples/fodo_userdef/input_fodo_userdef.in | 1 - examples/fodo_userdef/run_fodo_userdef.py | 2 +- examples/initialize_from_array/analyze_from_array.py | 2 +- examples/initialize_from_array/run_from_array.py | 2 +- examples/initialize_from_array/visualize_from_array.py | 2 +- examples/iota_lattice/analysis_iotalattice.py | 2 +- examples/iota_lattice/analysis_iotalattice_sdep.py | 2 +- examples/iota_lattice/input_iotalattice.in | 1 - examples/iota_lattice/input_iotalattice_envelope.in | 1 - examples/iota_lattice/input_iotalattice_sdep.in | 1 - examples/iota_lattice/run_iotalattice.py | 2 +- examples/iota_lattice/run_iotalattice_envelope.py | 2 +- examples/iota_lattice/run_iotalattice_sdep.py | 2 +- examples/iota_lens/analysis_iotalens.py | 2 +- examples/iota_lens/analysis_iotalens_sdep.py | 2 +- examples/iota_lens/analysis_iotalens_sdep_aperture.py | 2 +- examples/iota_lens/input_iotalens.in | 1 - examples/iota_lens/input_iotalens_sdep.in | 1 - examples/iota_lens/input_iotalens_sdep_aperture.in | 1 - examples/iota_lens/run_iotalens.py | 2 +- examples/iota_lens/run_iotalens_sdep.py | 2 +- examples/iota_lens/run_iotalens_sdep_aperture.py | 2 +- examples/kicker/analysis_kicker.py | 2 +- examples/kicker/input_kicker.in | 1 - examples/kicker/run_hvkicker_madx.py | 2 +- examples/kicker/run_kicker.py | 2 +- examples/kicker/run_kicker_madx.py | 2 +- examples/kurth/analysis_kurth.py | 2 +- examples/kurth/analysis_kurth_10nC.py | 2 +- examples/kurth/analysis_kurth_10nC_periodic.py | 2 +- examples/kurth/analysis_kurth_periodic.py | 2 +- examples/kurth/input_kurth_10nC_periodic.in | 1 - examples/kurth/input_kurth_10nC_periodic_envelope.in | 1 - examples/kurth/input_kurth_periodic.in | 1 - examples/kurth/run_kurth_10nC_periodic.py | 2 +- examples/kurth/run_kurth_10nC_periodic_envelope.py | 2 +- examples/kurth/run_kurth_periodic.py | 2 +- examples/linac_segment/analysis_linac_segment.py | 2 +- examples/linac_segment/input_linac_segment.in | 1 - examples/linac_segment/run_linac_segment.py | 2 +- examples/linear_map/analysis_map.py | 2 +- examples/linear_map/input_map.in | 1 - examples/linear_map/run_map.py | 2 +- examples/multipole/analysis_multipole.py | 2 +- examples/multipole/input_multipole.in | 1 - examples/multipole/run_multipole.py | 2 +- examples/optimize_triplet/analysis_triplet.py | 2 +- examples/optimize_triplet/run_triplet.py | 2 +- examples/positron_channel/analysis_positron.py | 2 +- examples/positron_channel/input_positron.in | 1 - examples/positron_channel/run_positron.py | 2 +- .../pytorch_surrogate_model/analyze_ml_surrogate_15_stage.py | 2 +- examples/pytorch_surrogate_model/run_ml_surrogate_15_stage.py | 2 +- .../visualize_ml_surrogate_15_stage.py | 2 +- examples/quadrupole_softedge/analysis_quadrupole_softedge.py | 2 +- examples/quadrupole_softedge/input_quadrupole_softedge.in | 1 - examples/quadrupole_softedge/run_quadrupole_softedge.py | 2 +- examples/rfcavity/analysis_rfcavity.py | 2 +- examples/rfcavity/input_rfcavity.in | 1 - examples/rfcavity/run_rfcavity.py | 2 +- examples/rotation/analysis_rotation.py | 2 +- examples/rotation/analysis_rotation_xy.py | 2 +- examples/rotation/input_rotation.in | 1 - examples/rotation/input_rotation_xy.in | 1 - examples/rotation/run_rotation.py | 2 +- examples/rotation/run_rotation_xy.py | 2 +- examples/scraping_beam/analysis_scraping.py | 2 +- examples/scraping_beam/input_scraping.in | 1 - examples/scraping_beam/run_scraping.py | 2 +- examples/solenoid/analysis_solenoid.py | 2 +- examples/solenoid/input_solenoid.in | 1 - examples/solenoid/run_solenoid.py | 2 +- examples/solenoid_restart/analysis_solenoid.py | 2 +- examples/solenoid_restart/input_solenoid.in | 3 +-- examples/solenoid_restart/run_solenoid.py | 4 ++-- examples/solenoid_softedge/analysis_solenoid_softedge.py | 2 +- examples/solenoid_softedge/input_solenoid_softedge.in | 1 - examples/solenoid_softedge/run_solenoid_softedge.py | 2 +- examples/thin_dipole/analysis_thin_dipole.py | 2 +- examples/thin_dipole/input_thin_dipole.in | 1 - examples/thin_dipole/run_thin_dipole.py | 2 +- src/python/impactx/madx_to_impactx.py | 2 +- tests/python/test_lattice_insert.py | 2 +- tests/python/test_xopt.py | 2 +- 197 files changed, 141 insertions(+), 208 deletions(-) diff --git a/docs/source/dataanalysis/dataanalysis.rst b/docs/source/dataanalysis/dataanalysis.rst index ff356ce85..cd999f91b 100644 --- a/docs/source/dataanalysis/dataanalysis.rst +++ b/docs/source/dataanalysis/dataanalysis.rst @@ -52,7 +52,7 @@ Example to print the integrated orbit path length ``s`` at each beam monitor pos import openpmd_api as io - series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) + series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) for k_i, i in series.iterations.items(): beam = i.particles["beam"] diff --git a/examples/achromatic_spectrometer/analysis_spectrometer.py b/examples/achromatic_spectrometer/analysis_spectrometer.py index bbf054600..3ea9edad5 100755 --- a/examples/achromatic_spectrometer/analysis_spectrometer.py +++ b/examples/achromatic_spectrometer/analysis_spectrometer.py @@ -35,7 +35,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/achromatic_spectrometer/input_spectrometer.in b/examples/achromatic_spectrometer/input_spectrometer.in index 3acb4113e..e81f0d4ed 100644 --- a/examples/achromatic_spectrometer/input_spectrometer.in +++ b/examples/achromatic_spectrometer/input_spectrometer.in @@ -25,7 +25,6 @@ lattice.elements = monitor bend1 plasma_lens drift1 monitor lattice.nslice = 25 monitor.type = beam_monitor -monitor.backend = h5 bend1.type = sbend_exact bend1.ds = 1.0 diff --git a/examples/achromatic_spectrometer/run_spectrometer.py b/examples/achromatic_spectrometer/run_spectrometer.py index 043ad229d..70126ee18 100755 --- a/examples/achromatic_spectrometer/run_spectrometer.py +++ b/examples/achromatic_spectrometer/run_spectrometer.py @@ -43,7 +43,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice ns = 25 # number of slices per ds in the element diff --git a/examples/alignment/analysis_alignment.py b/examples/alignment/analysis_alignment.py index a546b65bd..14bdf619c 100755 --- a/examples/alignment/analysis_alignment.py +++ b/examples/alignment/analysis_alignment.py @@ -37,7 +37,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/alignment/input_alignment.in b/examples/alignment/input_alignment.in index 1ef1cfe05..efefeaa9f 100644 --- a/examples/alignment/input_alignment.in +++ b/examples/alignment/input_alignment.in @@ -25,7 +25,6 @@ lattice.elements = monitor quad_err monitor lattice.nslice = 1 monitor.type = beam_monitor -monitor.backend = h5 quad_err.type = quad quad_err.ds = 1.0 diff --git a/examples/alignment/run_alignment.py b/examples/alignment/run_alignment.py index f384a749f..0bd5b26cb 100755 --- a/examples/alignment/run_alignment.py +++ b/examples/alignment/run_alignment.py @@ -43,7 +43,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice) ns = 1 # number of slices per ds in the element diff --git a/examples/aperture/analysis_absorber.py b/examples/aperture/analysis_absorber.py index e0cff8f59..954810b54 100755 --- a/examples/aperture/analysis_absorber.py +++ b/examples/aperture/analysis_absorber.py @@ -34,12 +34,12 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() -series_lost = io.Series("diags/openPMD/particles_lost.h5", io.Access.read_only) +series_lost = io.Series("diags/openPMD/particles_lost.%E", io.Access.read_only) particles_lost = series_lost.iterations[0].particles["beam"].to_df() # compare number of particles diff --git a/examples/aperture/analysis_aperture.py b/examples/aperture/analysis_aperture.py index 702cb6bc9..7696605ca 100755 --- a/examples/aperture/analysis_aperture.py +++ b/examples/aperture/analysis_aperture.py @@ -34,12 +34,12 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() -series_lost = io.Series("diags/openPMD/particles_lost.h5", io.Access.read_only) +series_lost = io.Series("diags/openPMD/particles_lost.%E", io.Access.read_only) particles_lost = series_lost.iterations[0].particles["beam"].to_df() # compare number of particles diff --git a/examples/aperture/analysis_aperture_periodic.py b/examples/aperture/analysis_aperture_periodic.py index 4c9c59cae..9c7bfd74e 100755 --- a/examples/aperture/analysis_aperture_periodic.py +++ b/examples/aperture/analysis_aperture_periodic.py @@ -34,12 +34,12 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() -series_lost = io.Series("diags/openPMD/particles_lost.h5", io.Access.read_only) +series_lost = io.Series("diags/openPMD/particles_lost.%E", io.Access.read_only) particles_lost = series_lost.iterations[0].particles["beam"].to_df() # compare number of particles diff --git a/examples/aperture/analysis_aperture_thick.py b/examples/aperture/analysis_aperture_thick.py index 702cb6bc9..7696605ca 100755 --- a/examples/aperture/analysis_aperture_thick.py +++ b/examples/aperture/analysis_aperture_thick.py @@ -34,12 +34,12 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() -series_lost = io.Series("diags/openPMD/particles_lost.h5", io.Access.read_only) +series_lost = io.Series("diags/openPMD/particles_lost.%E", io.Access.read_only) particles_lost = series_lost.iterations[0].particles["beam"].to_df() # compare number of particles diff --git a/examples/aperture/input_absorber.in b/examples/aperture/input_absorber.in index a564fd6ba..469108865 100644 --- a/examples/aperture/input_absorber.in +++ b/examples/aperture/input_absorber.in @@ -25,7 +25,6 @@ lattice.elements = monitor drift collimator monitor lattice.nslice = 1 monitor.type = beam_monitor -monitor.backend = h5 drift.type = drift drift.ds = 0.123 diff --git a/examples/aperture/input_aperture.in b/examples/aperture/input_aperture.in index 41218fc79..338926213 100644 --- a/examples/aperture/input_aperture.in +++ b/examples/aperture/input_aperture.in @@ -25,7 +25,6 @@ lattice.elements = monitor drift collimator monitor lattice.nslice = 1 monitor.type = beam_monitor -monitor.backend = h5 drift.type = drift drift.ds = 0.123 diff --git a/examples/aperture/input_aperture_periodic.in b/examples/aperture/input_aperture_periodic.in index c1c707924..bb7a5f418 100644 --- a/examples/aperture/input_aperture_periodic.in +++ b/examples/aperture/input_aperture_periodic.in @@ -25,7 +25,6 @@ lattice.elements = monitor drift pepperpot monitor lattice.nslice = 1 monitor.type = beam_monitor -monitor.backend = h5 drift.type = drift drift.ds = 0.123 diff --git a/examples/aperture/input_aperture_thick.in b/examples/aperture/input_aperture_thick.in index 0921240b0..1b885be6d 100644 --- a/examples/aperture/input_aperture_thick.in +++ b/examples/aperture/input_aperture_thick.in @@ -25,7 +25,6 @@ lattice.elements = monitor drift monitor lattice.nslice = 1 monitor.type = beam_monitor -monitor.backend = h5 drift.type = drift drift.ds = 0.123 diff --git a/examples/aperture/run_absorber.py b/examples/aperture/run_absorber.py index 12f7a2c6c..063d60ac4 100755 --- a/examples/aperture/run_absorber.py +++ b/examples/aperture/run_absorber.py @@ -15,7 +15,6 @@ sim.space_charge = False # sim.diagnostics = False # benchmarking sim.slice_step_diagnostics = True -sim.particle_lost_diagnostics_backend = "h5" # domain decomposition & space charge mesh sim.init_grids() @@ -43,7 +42,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice sim.lattice.extend( diff --git a/examples/aperture/run_aperture.py b/examples/aperture/run_aperture.py index b80922639..754dcc7b3 100755 --- a/examples/aperture/run_aperture.py +++ b/examples/aperture/run_aperture.py @@ -15,7 +15,6 @@ sim.space_charge = False # sim.diagnostics = False # benchmarking sim.slice_step_diagnostics = True -sim.particle_lost_diagnostics_backend = "h5" # domain decomposition & space charge mesh sim.init_grids() @@ -43,7 +42,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice sim.lattice.extend( diff --git a/examples/aperture/run_aperture_periodic.py b/examples/aperture/run_aperture_periodic.py index cb3874311..36ec62944 100755 --- a/examples/aperture/run_aperture_periodic.py +++ b/examples/aperture/run_aperture_periodic.py @@ -15,7 +15,6 @@ sim.space_charge = False # sim.diagnostics = False # benchmarking sim.slice_step_diagnostics = True -sim.particle_lost_diagnostics_backend = "h5" # domain decomposition & space charge mesh sim.init_grids() @@ -43,7 +42,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice sim.lattice.extend( diff --git a/examples/aperture/run_aperture_thick.py b/examples/aperture/run_aperture_thick.py index 6184c7946..2c0dae450 100755 --- a/examples/aperture/run_aperture_thick.py +++ b/examples/aperture/run_aperture_thick.py @@ -15,7 +15,6 @@ sim.space_charge = False # sim.diagnostics = False # benchmarking sim.slice_step_diagnostics = True -sim.particle_lost_diagnostics_backend = "h5" # domain decomposition & space charge mesh sim.init_grids() @@ -43,7 +42,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice sim.lattice.extend( diff --git a/examples/apochromatic/analysis_apochromatic.py b/examples/apochromatic/analysis_apochromatic.py index 175196051..ed396aad7 100755 --- a/examples/apochromatic/analysis_apochromatic.py +++ b/examples/apochromatic/analysis_apochromatic.py @@ -35,7 +35,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/apochromatic/analysis_apochromatic_pl.py b/examples/apochromatic/analysis_apochromatic_pl.py index 39acd7b8b..fce550313 100755 --- a/examples/apochromatic/analysis_apochromatic_pl.py +++ b/examples/apochromatic/analysis_apochromatic_pl.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/apochromatic/input_apochromatic.in b/examples/apochromatic/input_apochromatic.in index 7a396cbde..9405fd827 100644 --- a/examples/apochromatic/input_apochromatic.in +++ b/examples/apochromatic/input_apochromatic.in @@ -24,7 +24,6 @@ lattice.elements = monitor dr1 q1 q2 q3 dr2 q4 q5 dr2 q6 q7 q8 dr1 monitor lattice.nslice = 1 monitor.type = beam_monitor -monitor.backend = h5 dr1.type = drift_chromatic dr1.ds = 1.0 diff --git a/examples/apochromatic/input_apochromatic_pl.in b/examples/apochromatic/input_apochromatic_pl.in index ef6b3a2a9..baec744a9 100644 --- a/examples/apochromatic/input_apochromatic_pl.in +++ b/examples/apochromatic/input_apochromatic_pl.in @@ -25,7 +25,6 @@ lattice.elements = monitor dr1 q1 dr2 q2 dr2 q3 dr2 q4 dr2 q5 dr2 q6 dr2 q7 dr1 lattice.nslice = 1 monitor.type = beam_monitor -monitor.backend = h5 dr1.type = drift_chromatic dr1.ds = 1.0 diff --git a/examples/apochromatic/run_apochromatic.py b/examples/apochromatic/run_apochromatic.py index bda95f1c0..5357d62ee 100644 --- a/examples/apochromatic/run_apochromatic.py +++ b/examples/apochromatic/run_apochromatic.py @@ -44,7 +44,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice) ns = 25 # number of slices per ds in the element diff --git a/examples/apochromatic/run_apochromatic_pl.py b/examples/apochromatic/run_apochromatic_pl.py index 391af1999..7ee79d2b5 100644 --- a/examples/apochromatic/run_apochromatic_pl.py +++ b/examples/apochromatic/run_apochromatic_pl.py @@ -44,7 +44,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice) ns = 25 # number of slices per ds in the element diff --git a/examples/cfbend/analysis_cfbend.py b/examples/cfbend/analysis_cfbend.py index 118249bb0..c75326714 100755 --- a/examples/cfbend/analysis_cfbend.py +++ b/examples/cfbend/analysis_cfbend.py @@ -35,7 +35,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/cfbend/input_cfbend.in b/examples/cfbend/input_cfbend.in index 325a557a8..f99119ca7 100644 --- a/examples/cfbend/input_cfbend.in +++ b/examples/cfbend/input_cfbend.in @@ -31,7 +31,6 @@ cfbend1.rc = 7.613657587094493 # bending radius [m] cfbend1.k = -7.057403 # (upright) quadrupole component [m^(-2)] monitor.type = beam_monitor -monitor.backend = h5 ############################################################################### diff --git a/examples/cfbend/run_cfbend.py b/examples/cfbend/run_cfbend.py index 2b3de256f..55bc74f62 100644 --- a/examples/cfbend/run_cfbend.py +++ b/examples/cfbend/run_cfbend.py @@ -44,7 +44,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice ns = 25 # number of slices per ds in the element diff --git a/examples/cfchannel/analysis_cfchannel.py b/examples/cfchannel/analysis_cfchannel.py index 4951f068b..661202b89 100755 --- a/examples/cfchannel/analysis_cfchannel.py +++ b/examples/cfchannel/analysis_cfchannel.py @@ -35,7 +35,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/cfchannel/analysis_cfchannel_10nC.py b/examples/cfchannel/analysis_cfchannel_10nC.py index afa7201d8..ebbd323fe 100755 --- a/examples/cfchannel/analysis_cfchannel_10nC.py +++ b/examples/cfchannel/analysis_cfchannel_10nC.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/cfchannel/input_cfchannel.in b/examples/cfchannel/input_cfchannel.in index 6c6d06705..bf494388c 100644 --- a/examples/cfchannel/input_cfchannel.in +++ b/examples/cfchannel/input_cfchannel.in @@ -24,7 +24,6 @@ beam.mutpt = 0.0 lattice.elements = monitor constf1 monitor monitor.type = beam_monitor -monitor.backend = h5 constf1.type = constf constf1.ds = 2.0 diff --git a/examples/cfchannel/input_cfchannel_10nC_fft.in b/examples/cfchannel/input_cfchannel_10nC_fft.in index 1fedfc541..9d585166a 100644 --- a/examples/cfchannel/input_cfchannel_10nC_fft.in +++ b/examples/cfchannel/input_cfchannel_10nC_fft.in @@ -24,7 +24,6 @@ lattice.nslice = 50 #lattice.nslice = 60 # optional for increased precision monitor.type = beam_monitor -monitor.backend = h5 constf1.type = constf constf1.ds = 2.0 diff --git a/examples/cfchannel/input_cfchannel_10nC_mlmg.in b/examples/cfchannel/input_cfchannel_10nC_mlmg.in index a009a33d8..9d2cf88b5 100644 --- a/examples/cfchannel/input_cfchannel_10nC_mlmg.in +++ b/examples/cfchannel/input_cfchannel_10nC_mlmg.in @@ -24,7 +24,6 @@ lattice.nslice = 50 #lattice.nslice = 60 # optional for increased precision monitor.type = beam_monitor -monitor.backend = h5 constf1.type = constf constf1.ds = 2.0 diff --git a/examples/cfchannel/run_cfchannel.py b/examples/cfchannel/run_cfchannel.py index b817d3d38..8c4f929cc 100755 --- a/examples/cfchannel/run_cfchannel.py +++ b/examples/cfchannel/run_cfchannel.py @@ -41,7 +41,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice sim.lattice.extend( diff --git a/examples/cfchannel/run_cfchannel_10nC_fft.py b/examples/cfchannel/run_cfchannel_10nC_fft.py index 19f352d8f..0f698a569 100755 --- a/examples/cfchannel/run_cfchannel_10nC_fft.py +++ b/examples/cfchannel/run_cfchannel_10nC_fft.py @@ -44,7 +44,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice nslice = 50 # use 1e5 for increased precision diff --git a/examples/cfchannel/run_cfchannel_10nC_mlmg.py b/examples/cfchannel/run_cfchannel_10nC_mlmg.py index dc2506f65..13537e0c6 100755 --- a/examples/cfchannel/run_cfchannel_10nC_mlmg.py +++ b/examples/cfchannel/run_cfchannel_10nC_mlmg.py @@ -43,7 +43,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice nslice = 50 # use 1e5 for increased precision diff --git a/examples/chicane/analysis_chicane.py b/examples/chicane/analysis_chicane.py index 1411e04d2..205fc4f0e 100755 --- a/examples/chicane/analysis_chicane.py +++ b/examples/chicane/analysis_chicane.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/chicane/analysis_chicane_csr.py b/examples/chicane/analysis_chicane_csr.py index 581ae547b..f20f3332c 100755 --- a/examples/chicane/analysis_chicane_csr.py +++ b/examples/chicane/analysis_chicane_csr.py @@ -43,7 +43,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/chicane/input_chicane.in b/examples/chicane/input_chicane.in index c29b0ee33..58362cd01 100644 --- a/examples/chicane/input_chicane.in +++ b/examples/chicane/input_chicane.in @@ -55,7 +55,6 @@ dipedge2.g = 0.0 dipedge2.K2 = 0.0 monitor.type = beam_monitor -monitor.backend = h5 ############################################################################### diff --git a/examples/chicane/input_chicane_csr.in b/examples/chicane/input_chicane_csr.in index 103373909..003605462 100644 --- a/examples/chicane/input_chicane_csr.in +++ b/examples/chicane/input_chicane_csr.in @@ -58,7 +58,6 @@ dipedge2.g = 0.0 dipedge2.K2 = 0.0 monitor.type = beam_monitor -monitor.backend = h5 ############################################################################### diff --git a/examples/chicane/plot_chicane.py b/examples/chicane/plot_chicane.py index 04f833a68..e5025884d 100755 --- a/examples/chicane/plot_chicane.py +++ b/examples/chicane/plot_chicane.py @@ -72,7 +72,7 @@ def read_time_series(file_pattern): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/chicane/run_chicane.py b/examples/chicane/run_chicane.py index b7ad6efc1..1f747f7c0 100644 --- a/examples/chicane/run_chicane.py +++ b/examples/chicane/run_chicane.py @@ -44,7 +44,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice ns = 25 # number of slices per ds in the element diff --git a/examples/chicane/run_chicane_csr.py b/examples/chicane/run_chicane_csr.py index 0ebbfa510..804430a9e 100644 --- a/examples/chicane/run_chicane_csr.py +++ b/examples/chicane/run_chicane_csr.py @@ -46,7 +46,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice ns = 25 # number of slices per ds in the element diff --git a/examples/compression/analysis_compression.py b/examples/compression/analysis_compression.py index 947a5a16f..3329fc110 100755 --- a/examples/compression/analysis_compression.py +++ b/examples/compression/analysis_compression.py @@ -34,7 +34,7 @@ def get_moments(beam): # openPMD data series at the beam monitors -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) # first and last step final_step = list(series.iterations)[-1] diff --git a/examples/compression/input_compression.in b/examples/compression/input_compression.in index fc52eca68..edb04b0dd 100644 --- a/examples/compression/input_compression.in +++ b/examples/compression/input_compression.in @@ -24,7 +24,6 @@ beam.mutpt = 0.0 lattice.elements = monitor shortrf1 drift1 monitor monitor.type = beam_monitor -monitor.backend = h5 shortrf1.type = shortrf shortrf1.V = 1000.0 diff --git a/examples/compression/run_compression.py b/examples/compression/run_compression.py index 5ffda5521..11e148fe3 100644 --- a/examples/compression/run_compression.py +++ b/examples/compression/run_compression.py @@ -42,7 +42,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice sim.lattice.append(monitor) diff --git a/examples/coupled_optics/analysis_coupled_optics.py b/examples/coupled_optics/analysis_coupled_optics.py index 04b3eb998..a3fb81337 100755 --- a/examples/coupled_optics/analysis_coupled_optics.py +++ b/examples/coupled_optics/analysis_coupled_optics.py @@ -48,7 +48,7 @@ def get_eigenemittances(openpmd_beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial_beam = series.iterations[1].particles["beam"] initial = initial_beam.to_df() diff --git a/examples/coupled_optics/input_coupled_optics.in b/examples/coupled_optics/input_coupled_optics.in index dbe2cd328..b20d507da 100644 --- a/examples/coupled_optics/input_coupled_optics.in +++ b/examples/coupled_optics/input_coupled_optics.in @@ -55,7 +55,6 @@ sol.ds = 3.820395 sol.ks = 0.8223219329893234 monitor.type = beam_monitor -monitor.backend = h5 ############################################################################### diff --git a/examples/coupled_optics/run_coupled_optics.py b/examples/coupled_optics/run_coupled_optics.py index 5c14a6461..106bb3745 100644 --- a/examples/coupled_optics/run_coupled_optics.py +++ b/examples/coupled_optics/run_coupled_optics.py @@ -45,7 +45,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice ns = 25 # number of slices per ds in the element diff --git a/examples/cyclotron/analysis_cyclotron.py b/examples/cyclotron/analysis_cyclotron.py index b475d771a..23b688145 100755 --- a/examples/cyclotron/analysis_cyclotron.py +++ b/examples/cyclotron/analysis_cyclotron.py @@ -35,7 +35,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/cyclotron/analysis_cyclotron_loss.py b/examples/cyclotron/analysis_cyclotron_loss.py index 22bc03c91..fc60a3056 100755 --- a/examples/cyclotron/analysis_cyclotron_loss.py +++ b/examples/cyclotron/analysis_cyclotron_loss.py @@ -35,7 +35,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial_beam = series.iterations[1].particles["beam"] final_beam = series.iterations[last_step].particles["beam"] diff --git a/examples/cyclotron/input_cyclotron.in b/examples/cyclotron/input_cyclotron.in index 8ca40b66e..515dc824a 100644 --- a/examples/cyclotron/input_cyclotron.in +++ b/examples/cyclotron/input_cyclotron.in @@ -26,7 +26,6 @@ lattice.periods = 150 lattice.nslice = 1 monitor.type = beam_monitor -monitor.backend = h5 half.type = line half.elements = gap bend diff --git a/examples/cyclotron/input_cyclotron_loss.in b/examples/cyclotron/input_cyclotron_loss.in index 9396b0efd..4e6ccebf2 100644 --- a/examples/cyclotron/input_cyclotron_loss.in +++ b/examples/cyclotron/input_cyclotron_loss.in @@ -26,7 +26,6 @@ lattice.periods = 150 lattice.nslice = 1 monitor.type = beam_monitor -monitor.backend = h5 half.type = line half.elements = gap bend diff --git a/examples/cyclotron/run_cyclotron.py b/examples/cyclotron/run_cyclotron.py index ea5af473d..8af90db63 100755 --- a/examples/cyclotron/run_cyclotron.py +++ b/examples/cyclotron/run_cyclotron.py @@ -43,7 +43,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice) ns = 1 # number of slices per ds in the element diff --git a/examples/cyclotron/run_cyclotron_loss.py b/examples/cyclotron/run_cyclotron_loss.py index c115df924..50026bee4 100755 --- a/examples/cyclotron/run_cyclotron_loss.py +++ b/examples/cyclotron/run_cyclotron_loss.py @@ -15,7 +15,6 @@ sim.space_charge = False # sim.diagnostics = False # benchmarking sim.slice_step_diagnostics = True -sim.particle_lost_diagnostics_backend = "h5" # domain decomposition & space charge mesh sim.init_grids() @@ -44,7 +43,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice) ns = 1 # number of slices per ds in the element diff --git a/examples/distgen/analysis_gaussian.py b/examples/distgen/analysis_gaussian.py index efd96f33b..b1b122796 100755 --- a/examples/distgen/analysis_gaussian.py +++ b/examples/distgen/analysis_gaussian.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/distgen/analysis_kurth4d.py b/examples/distgen/analysis_kurth4d.py index 0dc39c778..0bd9d352e 100755 --- a/examples/distgen/analysis_kurth4d.py +++ b/examples/distgen/analysis_kurth4d.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/distgen/analysis_kvdist.py b/examples/distgen/analysis_kvdist.py index 4c7a3537a..6e9c8a4ea 100755 --- a/examples/distgen/analysis_kvdist.py +++ b/examples/distgen/analysis_kvdist.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/distgen/analysis_semigaussian.py b/examples/distgen/analysis_semigaussian.py index efd96f33b..b1b122796 100755 --- a/examples/distgen/analysis_semigaussian.py +++ b/examples/distgen/analysis_semigaussian.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/distgen/input_gaussian_twiss.in b/examples/distgen/input_gaussian_twiss.in index b0f68d3d3..e57ceec3a 100644 --- a/examples/distgen/input_gaussian_twiss.in +++ b/examples/distgen/input_gaussian_twiss.in @@ -24,7 +24,6 @@ beam.emittT = 2e-06 lattice.elements = monitor drift1 quad1 drift2 quad2 drift3 monitor monitor.type = beam_monitor -monitor.backend = h5 drift1.type = drift drift1.ds = 0.25 diff --git a/examples/distgen/input_kurth4d.in b/examples/distgen/input_kurth4d.in index e53a4a65e..d5e21e192 100644 --- a/examples/distgen/input_kurth4d.in +++ b/examples/distgen/input_kurth4d.in @@ -24,7 +24,6 @@ beam.mutpt = 0.0 lattice.elements = monitor constf1 monitor monitor.type = beam_monitor -monitor.backend = h5 constf1.type = constf constf1.ds = 2.0 diff --git a/examples/distgen/input_kvdist_twiss.in b/examples/distgen/input_kvdist_twiss.in index 8dbce72f7..2a257c4bd 100644 --- a/examples/distgen/input_kvdist_twiss.in +++ b/examples/distgen/input_kvdist_twiss.in @@ -24,7 +24,6 @@ beam.emittT = 2e-06 lattice.elements = monitor drift1 quad1 drift2 quad2 drift3 monitor monitor.type = beam_monitor -monitor.backend = h5 drift1.type = drift drift1.ds = 0.25 diff --git a/examples/distgen/input_semigaussian.in b/examples/distgen/input_semigaussian.in index 734458c6b..2756bbf27 100644 --- a/examples/distgen/input_semigaussian.in +++ b/examples/distgen/input_semigaussian.in @@ -24,7 +24,6 @@ beam.mutpt = 0.0 lattice.elements = monitor drift1 quad1 drift2 quad2 drift3 monitor monitor.type = beam_monitor -monitor.backend = h5 drift1.type = drift drift1.ds = 0.25 diff --git a/examples/distgen/run_gaussian_twiss.py b/examples/distgen/run_gaussian_twiss.py index 9e3a897c6..8777edc0f 100755 --- a/examples/distgen/run_gaussian_twiss.py +++ b/examples/distgen/run_gaussian_twiss.py @@ -46,7 +46,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice) ns = 25 # number of slices per ds in the element diff --git a/examples/distgen/run_kurth4d.py b/examples/distgen/run_kurth4d.py index 6731a92ef..e785f9097 100755 --- a/examples/distgen/run_kurth4d.py +++ b/examples/distgen/run_kurth4d.py @@ -45,7 +45,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice) constf = [ diff --git a/examples/distgen/run_kvdist_twiss.py b/examples/distgen/run_kvdist_twiss.py index da77dc26e..300db5759 100755 --- a/examples/distgen/run_kvdist_twiss.py +++ b/examples/distgen/run_kvdist_twiss.py @@ -46,7 +46,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice) ns = 25 # number of slices per ds in the element diff --git a/examples/distgen/run_semigaussian.py b/examples/distgen/run_semigaussian.py index 8b43612db..a2ade5833 100755 --- a/examples/distgen/run_semigaussian.py +++ b/examples/distgen/run_semigaussian.py @@ -44,7 +44,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice) ns = 25 # number of slices per ds in the element diff --git a/examples/dogleg/analysis_dogleg.py b/examples/dogleg/analysis_dogleg.py index 7a890e06c..8385ae50c 100755 --- a/examples/dogleg/analysis_dogleg.py +++ b/examples/dogleg/analysis_dogleg.py @@ -53,7 +53,7 @@ def get_twiss(openpmd_beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final_beam = series.iterations[last_step].particles["beam"] diff --git a/examples/dogleg/input_dogleg.in b/examples/dogleg/input_dogleg.in index 347b7f59b..bef6a5cdb 100644 --- a/examples/dogleg/input_dogleg.in +++ b/examples/dogleg/input_dogleg.in @@ -51,7 +51,6 @@ dipedge2.g = 0.0 dipedge2.K2 = 0.0 monitor.type = beam_monitor -monitor.backend = h5 ############################################################################### diff --git a/examples/dogleg/run_dogleg.py b/examples/dogleg/run_dogleg.py index 9fc1e857d..a8822a0a8 100644 --- a/examples/dogleg/run_dogleg.py +++ b/examples/dogleg/run_dogleg.py @@ -44,7 +44,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice ns = 25 # number of slices per ds in the element diff --git a/examples/epac2004_benchmarks/analysis_bithermal.py b/examples/epac2004_benchmarks/analysis_bithermal.py index 4a307207a..3af68ddf5 100755 --- a/examples/epac2004_benchmarks/analysis_bithermal.py +++ b/examples/epac2004_benchmarks/analysis_bithermal.py @@ -35,7 +35,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/epac2004_benchmarks/analysis_fodo_rf_SC.py b/examples/epac2004_benchmarks/analysis_fodo_rf_SC.py index cea4ec6d1..97f1e5237 100755 --- a/examples/epac2004_benchmarks/analysis_fodo_rf_SC.py +++ b/examples/epac2004_benchmarks/analysis_fodo_rf_SC.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/epac2004_benchmarks/analysis_thermal.py b/examples/epac2004_benchmarks/analysis_thermal.py index 42c937348..29da23656 100755 --- a/examples/epac2004_benchmarks/analysis_thermal.py +++ b/examples/epac2004_benchmarks/analysis_thermal.py @@ -35,7 +35,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/epac2004_benchmarks/input_bithermal.in b/examples/epac2004_benchmarks/input_bithermal.in index 2345b1415..bacabba2a 100644 --- a/examples/epac2004_benchmarks/input_bithermal.in +++ b/examples/epac2004_benchmarks/input_bithermal.in @@ -22,7 +22,6 @@ beam.normalize_halo = 0.08195 lattice.elements = monitor constf1 monitor monitor.type = beam_monitor -monitor.backend = h5 constf1.type = constf constf1.ds = 10.0 diff --git a/examples/epac2004_benchmarks/input_fodo_rf_SC.in b/examples/epac2004_benchmarks/input_fodo_rf_SC.in index 67229db67..d3fbfdc5d 100644 --- a/examples/epac2004_benchmarks/input_fodo_rf_SC.in +++ b/examples/epac2004_benchmarks/input_fodo_rf_SC.in @@ -24,7 +24,6 @@ beam.mutpt = 0.0 lattice.elements = monitor fquad dr gapa1 dr dquad dr gapb1 dr fquad monitor monitor.type = beam_monitor -monitor.backend = h5 dr.type = drift dr.ds = 0.1 diff --git a/examples/epac2004_benchmarks/input_fodo_rf_SC_envelope.in b/examples/epac2004_benchmarks/input_fodo_rf_SC_envelope.in index 7645307f2..702f6b138 100644 --- a/examples/epac2004_benchmarks/input_fodo_rf_SC_envelope.in +++ b/examples/epac2004_benchmarks/input_fodo_rf_SC_envelope.in @@ -22,7 +22,6 @@ beam.mutpt = 0.0 lattice.elements = monitor fquad dr gapa1 dr dquad dr gapb1 dr fquad monitor monitor.type = beam_monitor -monitor.backend = h5 dr.type = drift dr.ds = 0.1 diff --git a/examples/epac2004_benchmarks/input_thermal.in b/examples/epac2004_benchmarks/input_thermal.in index 10bc41518..d0ad13635 100644 --- a/examples/epac2004_benchmarks/input_thermal.in +++ b/examples/epac2004_benchmarks/input_thermal.in @@ -18,7 +18,6 @@ beam.normalize = 0.41604661 lattice.elements = monitor constf1 monitor monitor.type = beam_monitor -monitor.backend = h5 constf1.type = constf constf1.ds = 10.0 diff --git a/examples/epac2004_benchmarks/plot_bithermal.py b/examples/epac2004_benchmarks/plot_bithermal.py index 97657448e..43565cd8e 100755 --- a/examples/epac2004_benchmarks/plot_bithermal.py +++ b/examples/epac2004_benchmarks/plot_bithermal.py @@ -21,7 +21,7 @@ # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial_beam = series.iterations[1].particles["beam"].to_df() final_beam = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/epac2004_benchmarks/run_bithermal.py b/examples/epac2004_benchmarks/run_bithermal.py index aba07705e..8b3386891 100755 --- a/examples/epac2004_benchmarks/run_bithermal.py +++ b/examples/epac2004_benchmarks/run_bithermal.py @@ -46,7 +46,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice sim.lattice.append(monitor) diff --git a/examples/epac2004_benchmarks/run_fodo_rf_SC.py b/examples/epac2004_benchmarks/run_fodo_rf_SC.py index 8a6f2a84d..3ef89a983 100755 --- a/examples/epac2004_benchmarks/run_fodo_rf_SC.py +++ b/examples/epac2004_benchmarks/run_fodo_rf_SC.py @@ -44,7 +44,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice sim.lattice.append(monitor) diff --git a/examples/epac2004_benchmarks/run_fodo_rf_SC_envelope.py b/examples/epac2004_benchmarks/run_fodo_rf_SC_envelope.py index baf9c350f..e8450d2f7 100755 --- a/examples/epac2004_benchmarks/run_fodo_rf_SC_envelope.py +++ b/examples/epac2004_benchmarks/run_fodo_rf_SC_envelope.py @@ -43,7 +43,7 @@ sim.init_envelope(ref, distr, bunch_charge_C) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice sim.lattice.append(monitor) diff --git a/examples/epac2004_benchmarks/run_thermal.py b/examples/epac2004_benchmarks/run_thermal.py index f8fe36503..66b27b9c0 100755 --- a/examples/epac2004_benchmarks/run_thermal.py +++ b/examples/epac2004_benchmarks/run_thermal.py @@ -44,7 +44,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice sim.lattice.append(monitor) diff --git a/examples/expanding_beam/analysis_expanding.py b/examples/expanding_beam/analysis_expanding.py index 086f32f8f..d287a6a58 100755 --- a/examples/expanding_beam/analysis_expanding.py +++ b/examples/expanding_beam/analysis_expanding.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/expanding_beam/input_expanding_envelope.in b/examples/expanding_beam/input_expanding_envelope.in index 4f5378db3..bcfc8ee9b 100644 --- a/examples/expanding_beam/input_expanding_envelope.in +++ b/examples/expanding_beam/input_expanding_envelope.in @@ -23,7 +23,6 @@ drift1.type = drift drift1.ds = 6.0 monitor.type = beam_monitor -monitor.backend = h5 ############################################################################### diff --git a/examples/expanding_beam/input_expanding_fft.in b/examples/expanding_beam/input_expanding_fft.in index 45676b5de..26ee0eb86 100644 --- a/examples/expanding_beam/input_expanding_fft.in +++ b/examples/expanding_beam/input_expanding_fft.in @@ -25,7 +25,6 @@ drift1.type = drift drift1.ds = 6.0 monitor.type = beam_monitor -monitor.backend = h5 ############################################################################### diff --git a/examples/expanding_beam/input_expanding_mlmg.in b/examples/expanding_beam/input_expanding_mlmg.in index cb2693e2b..89f4de365 100644 --- a/examples/expanding_beam/input_expanding_mlmg.in +++ b/examples/expanding_beam/input_expanding_mlmg.in @@ -25,7 +25,6 @@ drift1.type = drift drift1.ds = 6.0 monitor.type = beam_monitor -monitor.backend = h5 ############################################################################### diff --git a/examples/expanding_beam/run_expanding_envelope.py b/examples/expanding_beam/run_expanding_envelope.py index 1d2d2117a..e64c78c42 100755 --- a/examples/expanding_beam/run_expanding_envelope.py +++ b/examples/expanding_beam/run_expanding_envelope.py @@ -42,7 +42,7 @@ sim.init_envelope(ref, distr, bunch_charge_C) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice sim.lattice.extend([monitor, elements.Drift(name="d1", ds=6.0, nslice=40), monitor]) diff --git a/examples/expanding_beam/run_expanding_fft.py b/examples/expanding_beam/run_expanding_fft.py index e34ef060f..d8018d77c 100755 --- a/examples/expanding_beam/run_expanding_fft.py +++ b/examples/expanding_beam/run_expanding_fft.py @@ -52,7 +52,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice sim.lattice.extend([monitor, elements.Drift(name="d1", ds=6.0, nslice=40), monitor]) diff --git a/examples/expanding_beam/run_expanding_mlmg.py b/examples/expanding_beam/run_expanding_mlmg.py index a53246e99..20177c386 100755 --- a/examples/expanding_beam/run_expanding_mlmg.py +++ b/examples/expanding_beam/run_expanding_mlmg.py @@ -51,7 +51,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice sim.lattice.extend([monitor, elements.Drift(name="d1", ds=6.0, nslice=40), monitor]) diff --git a/examples/fodo/analysis_fodo.py b/examples/fodo/analysis_fodo.py index cb4b4dcdd..390e3a65a 100755 --- a/examples/fodo/analysis_fodo.py +++ b/examples/fodo/analysis_fodo.py @@ -35,7 +35,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() beam_final = series.iterations[last_step].particles["beam"] diff --git a/examples/fodo/input_fodo.in b/examples/fodo/input_fodo.in index bb9076374..e749e4141 100644 --- a/examples/fodo/input_fodo.in +++ b/examples/fodo/input_fodo.in @@ -25,7 +25,6 @@ lattice.elements = monitor drift1 monitor quad1 monitor drift2 monitor quad2 mon lattice.nslice = 25 monitor.type = beam_monitor -monitor.backend = h5 drift1.type = drift drift1.ds = 0.25 diff --git a/examples/fodo/input_fodo_envelope.in b/examples/fodo/input_fodo_envelope.in index 075c5313b..e117daa79 100644 --- a/examples/fodo/input_fodo_envelope.in +++ b/examples/fodo/input_fodo_envelope.in @@ -22,7 +22,6 @@ lattice.elements = monitor drift1 monitor quad1 monitor drift2 monitor quad2 mon lattice.nslice = 25 monitor.type = beam_monitor -monitor.backend = h5 drift1.type = drift drift1.ds = 0.25 diff --git a/examples/fodo/input_fodo_twiss.in b/examples/fodo/input_fodo_twiss.in index 954dc6a5e..cfe11a42f 100644 --- a/examples/fodo/input_fodo_twiss.in +++ b/examples/fodo/input_fodo_twiss.in @@ -25,7 +25,6 @@ lattice.elements = monitor drift1 monitor quad1 monitor drift2 monitor quad2 mon lattice.nslice = 25 monitor.type = beam_monitor -monitor.backend = h5 drift1.type = drift drift1.ds = 0.25 diff --git a/examples/fodo/plot_fodo.py b/examples/fodo/plot_fodo.py index a89890c2a..2257773f8 100755 --- a/examples/fodo/plot_fodo.py +++ b/examples/fodo/plot_fodo.py @@ -72,7 +72,7 @@ def read_time_series(file_pattern): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/fodo/run_fodo.py b/examples/fodo/run_fodo.py index 1eee1baee..8a159b260 100755 --- a/examples/fodo/run_fodo.py +++ b/examples/fodo/run_fodo.py @@ -44,7 +44,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice) ns = 25 # number of slices per ds in the element diff --git a/examples/fodo/run_fodo_envelope.py b/examples/fodo/run_fodo_envelope.py index 613192130..05df6b044 100755 --- a/examples/fodo/run_fodo_envelope.py +++ b/examples/fodo/run_fodo_envelope.py @@ -43,7 +43,7 @@ sim.init_envelope(ref, distr) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice) ns = 25 # number of slices per ds in the element diff --git a/examples/fodo/run_fodo_twiss.py b/examples/fodo/run_fodo_twiss.py index 156c22ea8..56c222736 100755 --- a/examples/fodo/run_fodo_twiss.py +++ b/examples/fodo/run_fodo_twiss.py @@ -46,7 +46,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice) ns = 25 # number of slices per ds in the element diff --git a/examples/fodo_channel/analysis_fodo.py b/examples/fodo_channel/analysis_fodo.py index 127a4af0a..a8e916bcf 100755 --- a/examples/fodo_channel/analysis_fodo.py +++ b/examples/fodo_channel/analysis_fodo.py @@ -35,7 +35,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/fodo_channel/input_fodo.in b/examples/fodo_channel/input_fodo.in index 51f06a275..e001e38a0 100644 --- a/examples/fodo_channel/input_fodo.in +++ b/examples/fodo_channel/input_fodo.in @@ -27,7 +27,6 @@ lattice.periods = 101 # FODO channel of 101 periods monitor.type = beam_monitor monitor.period_sample_intervals = 10 -monitor.backend = h5 drift1.type = drift drift1.ds = 0.25 diff --git a/examples/fodo_channel/plot_fodo.py b/examples/fodo_channel/plot_fodo.py index 5ec2b6715..ee989c962 100755 --- a/examples/fodo_channel/plot_fodo.py +++ b/examples/fodo_channel/plot_fodo.py @@ -72,7 +72,7 @@ def read_time_series(file_pattern): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/fodo_channel/run_fodo.py b/examples/fodo_channel/run_fodo.py index ecc64125a..bc5a13ade 100755 --- a/examples/fodo_channel/run_fodo.py +++ b/examples/fodo_channel/run_fodo.py @@ -46,7 +46,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5", period_sample_intervals=10) +monitor = elements.BeamMonitor("monitor", period_sample_intervals=10) # design the accelerator lattice) ns = 5 # number of slices per ds in the element diff --git a/examples/fodo_chromatic/analysis_fodo_chr.py b/examples/fodo_chromatic/analysis_fodo_chr.py index f4e3e6b89..4a97db1ad 100755 --- a/examples/fodo_chromatic/analysis_fodo_chr.py +++ b/examples/fodo_chromatic/analysis_fodo_chr.py @@ -35,7 +35,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/fodo_chromatic/input_fodo_chr.in b/examples/fodo_chromatic/input_fodo_chr.in index 373a08e07..e03c35397 100644 --- a/examples/fodo_chromatic/input_fodo_chr.in +++ b/examples/fodo_chromatic/input_fodo_chr.in @@ -25,7 +25,6 @@ lattice.elements = monitor drift1 monitor quad1 monitor drift2 monitor quad2 mon lattice.nslice = 25 monitor.type = beam_monitor -monitor.backend = h5 drift1.type = drift_chromatic drift1.ds = 0.25 diff --git a/examples/fodo_chromatic/run_fodo_chr.py b/examples/fodo_chromatic/run_fodo_chr.py index 27f83a487..77d5d551d 100755 --- a/examples/fodo_chromatic/run_fodo_chr.py +++ b/examples/fodo_chromatic/run_fodo_chr.py @@ -44,7 +44,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice) ns = 25 # number of slices per ds in the element diff --git a/examples/fodo_programmable/run_fodo_programmable.py b/examples/fodo_programmable/run_fodo_programmable.py index 33ecc8f03..c8ee08830 100755 --- a/examples/fodo_programmable/run_fodo_programmable.py +++ b/examples/fodo_programmable/run_fodo_programmable.py @@ -127,7 +127,7 @@ def my_ref_drift(pge, refpart): pge2.ds = 0.5 # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice fodo = [ diff --git a/examples/fodo_rf/analysis_fodo_rf.py b/examples/fodo_rf/analysis_fodo_rf.py index 94cf9521e..9ca2bbcd9 100755 --- a/examples/fodo_rf/analysis_fodo_rf.py +++ b/examples/fodo_rf/analysis_fodo_rf.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/fodo_rf/input_fodo_rf.in b/examples/fodo_rf/input_fodo_rf.in index 7e1cfa11f..92e105020 100644 --- a/examples/fodo_rf/input_fodo_rf.in +++ b/examples/fodo_rf/input_fodo_rf.in @@ -25,7 +25,6 @@ lattice.elements = monitor quad1 drift1 shortrf1 drift1 quad2 drift1 \ shortrf1 drift1 quad1 monitor monitor.type = beam_monitor -monitor.backend = h5 quad1.type = quad quad1.ds = 0.15 diff --git a/examples/fodo_rf/run_fodo_rf.py b/examples/fodo_rf/run_fodo_rf.py index 45bbca142..597691813 100644 --- a/examples/fodo_rf/run_fodo_rf.py +++ b/examples/fodo_rf/run_fodo_rf.py @@ -42,7 +42,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice sim.lattice.append(monitor) diff --git a/examples/fodo_space_charge/input_fodo_envelope_sc.in b/examples/fodo_space_charge/input_fodo_envelope_sc.in index 0ee52f44f..ae21ecefb 100644 --- a/examples/fodo_space_charge/input_fodo_envelope_sc.in +++ b/examples/fodo_space_charge/input_fodo_envelope_sc.in @@ -22,7 +22,6 @@ lattice.elements = monitor drift1 quad1 drift2 quad2 drift1 monitor lattice.nslice = 50 monitor.type = beam_monitor -monitor.backend = h5 drift1.type = drift drift1.ds = 7.44e-2 diff --git a/examples/fodo_space_charge/run_fodo_envelope_sc.py b/examples/fodo_space_charge/run_fodo_envelope_sc.py index 929a24e43..9fb08c15e 100755 --- a/examples/fodo_space_charge/run_fodo_envelope_sc.py +++ b/examples/fodo_space_charge/run_fodo_envelope_sc.py @@ -47,7 +47,7 @@ sim.init_envelope(ref, distr, beam_current_A) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice) ns = 50 # number of slices per ds in the element diff --git a/examples/fodo_tune/analysis_fodo_tune.py b/examples/fodo_tune/analysis_fodo_tune.py index 6e70d4a5d..cc75813e3 100755 --- a/examples/fodo_tune/analysis_fodo_tune.py +++ b/examples/fodo_tune/analysis_fodo_tune.py @@ -10,7 +10,7 @@ import PyNAFF as pnf # Collect beam data series -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) # Specify time series for particle j j = 5 diff --git a/examples/fodo_tune/input_fodo_tune.in b/examples/fodo_tune/input_fodo_tune.in index c35ce3c30..51a9ca720 100644 --- a/examples/fodo_tune/input_fodo_tune.in +++ b/examples/fodo_tune/input_fodo_tune.in @@ -27,7 +27,6 @@ lattice.elements = monitor drift1 quad1 drift2 quad2 drift3 lattice.nslice = 1 monitor.type = beam_monitor -monitor.backend = h5 drift1.type = drift drift1.ds = 0.25 diff --git a/examples/fodo_tune/run_fodo_tune.py b/examples/fodo_tune/run_fodo_tune.py index 5e095589e..0ebbb4073 100755 --- a/examples/fodo_tune/run_fodo_tune.py +++ b/examples/fodo_tune/run_fodo_tune.py @@ -44,7 +44,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice) ns = 1 # number of slices per ds in the element diff --git a/examples/fodo_userdef/input_fodo_userdef.in b/examples/fodo_userdef/input_fodo_userdef.in index 420597477..da3c71aac 100644 --- a/examples/fodo_userdef/input_fodo_userdef.in +++ b/examples/fodo_userdef/input_fodo_userdef.in @@ -25,7 +25,6 @@ lattice.elements = monitor drift1 monitor quad1 monitor drift2 monitor quad2 mon lattice.nslice = 25 monitor.type = beam_monitor -monitor.backend = h5 drift1.type = linear_map drift1.ds = 0.25 diff --git a/examples/fodo_userdef/run_fodo_userdef.py b/examples/fodo_userdef/run_fodo_userdef.py index 49c555091..f18785f6a 100755 --- a/examples/fodo_userdef/run_fodo_userdef.py +++ b/examples/fodo_userdef/run_fodo_userdef.py @@ -46,7 +46,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # add a user-defined, linear element for the drifts Iden = Map6x6.identity() diff --git a/examples/initialize_from_array/analyze_from_array.py b/examples/initialize_from_array/analyze_from_array.py index 250d172fa..39102cc73 100644 --- a/examples/initialize_from_array/analyze_from_array.py +++ b/examples/initialize_from_array/analyze_from_array.py @@ -12,7 +12,7 @@ print("Initial Beam:") -beam_series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +beam_series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) ref_series = ix_read.read_time_series("diags/ref_particle.*") num_particles = int(1e5) diff --git a/examples/initialize_from_array/run_from_array.py b/examples/initialize_from_array/run_from_array.py index d72cc02bf..25cb4de44 100644 --- a/examples/initialize_from_array/run_from_array.py +++ b/examples/initialize_from_array/run_from_array.py @@ -94,7 +94,7 @@ dx_podv, dy_podv, dt_podv, dpx_podv, dpy_podv, dpt_podv, qm_eev, bunch_charge_C ) -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") sim.lattice.extend( [ monitor, diff --git a/examples/initialize_from_array/visualize_from_array.py b/examples/initialize_from_array/visualize_from_array.py index bc88a3bd5..094796ad2 100644 --- a/examples/initialize_from_array/visualize_from_array.py +++ b/examples/initialize_from_array/visualize_from_array.py @@ -12,7 +12,7 @@ from matplotlib import pyplot as plt ######## plot phase spaces ########### -beam_series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +beam_series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) beam_steps = list(beam_series.iterations) ref_series = ix_plt.read_time_series("diags/ref_particle.*") diff --git a/examples/iota_lattice/analysis_iotalattice.py b/examples/iota_lattice/analysis_iotalattice.py index dab515978..40c7ecad7 100755 --- a/examples/iota_lattice/analysis_iotalattice.py +++ b/examples/iota_lattice/analysis_iotalattice.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/iota_lattice/analysis_iotalattice_sdep.py b/examples/iota_lattice/analysis_iotalattice_sdep.py index 39418c5c2..3accd9e80 100755 --- a/examples/iota_lattice/analysis_iotalattice_sdep.py +++ b/examples/iota_lattice/analysis_iotalattice_sdep.py @@ -24,7 +24,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/iota_lattice/input_iotalattice.in b/examples/iota_lattice/input_iotalattice.in index 1c736115a..3049ac092 100644 --- a/examples/iota_lattice/input_iotalattice.in +++ b/examples/iota_lattice/input_iotalattice.in @@ -213,7 +213,6 @@ qe3.k = -6.69148177 # Beam Monitor: Diagnostics monitor.type = beam_monitor -monitor.backend = h5 monitor.nonlinear_lens_invariants = true diff --git a/examples/iota_lattice/input_iotalattice_envelope.in b/examples/iota_lattice/input_iotalattice_envelope.in index f3b944a44..b019e9c22 100644 --- a/examples/iota_lattice/input_iotalattice_envelope.in +++ b/examples/iota_lattice/input_iotalattice_envelope.in @@ -210,7 +210,6 @@ qe3.k = -6.69148177 # Beam Monitor: Diagnostics monitor.type = beam_monitor -monitor.backend = h5 monitor.nonlinear_lens_invariants = true diff --git a/examples/iota_lattice/input_iotalattice_sdep.in b/examples/iota_lattice/input_iotalattice_sdep.in index 424c562c4..2c5fb2dc8 100644 --- a/examples/iota_lattice/input_iotalattice_sdep.in +++ b/examples/iota_lattice/input_iotalattice_sdep.in @@ -270,7 +270,6 @@ qe3.k = -6.69148177 # Beam Monitor: Diagnostics monitor.type = beam_monitor -monitor.backend = h5 monitor.nonlinear_lens_invariants = true monitor.alpha = 1.376381920471173 monitor.beta = 1.892632003628881 diff --git a/examples/iota_lattice/run_iotalattice.py b/examples/iota_lattice/run_iotalattice.py index 61b77a27c..1c9b6bf7d 100644 --- a/examples/iota_lattice/run_iotalattice.py +++ b/examples/iota_lattice/run_iotalattice.py @@ -40,7 +40,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # init accelerator lattice ns = 10 # number of slices per ds in the element diff --git a/examples/iota_lattice/run_iotalattice_envelope.py b/examples/iota_lattice/run_iotalattice_envelope.py index 573bdfd6b..975c7edf5 100755 --- a/examples/iota_lattice/run_iotalattice_envelope.py +++ b/examples/iota_lattice/run_iotalattice_envelope.py @@ -39,7 +39,7 @@ sim.init_envelope(ref, distr) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # init accelerator lattice ns = 10 # number of slices per ds in the element diff --git a/examples/iota_lattice/run_iotalattice_sdep.py b/examples/iota_lattice/run_iotalattice_sdep.py index ca3f5a0cb..03843047c 100644 --- a/examples/iota_lattice/run_iotalattice_sdep.py +++ b/examples/iota_lattice/run_iotalattice_sdep.py @@ -45,7 +45,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") monitor.nonlinear_lens_invariants = True monitor.alpha = 1.376381920471173 monitor.beta = 1.892632003628881 diff --git a/examples/iota_lens/analysis_iotalens.py b/examples/iota_lens/analysis_iotalens.py index cb462b873..b49642058 100755 --- a/examples/iota_lens/analysis_iotalens.py +++ b/examples/iota_lens/analysis_iotalens.py @@ -25,7 +25,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/iota_lens/analysis_iotalens_sdep.py b/examples/iota_lens/analysis_iotalens_sdep.py index a5c193896..d15c36eab 100755 --- a/examples/iota_lens/analysis_iotalens_sdep.py +++ b/examples/iota_lens/analysis_iotalens_sdep.py @@ -24,7 +24,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/iota_lens/analysis_iotalens_sdep_aperture.py b/examples/iota_lens/analysis_iotalens_sdep_aperture.py index 5f7a822d8..239c2b678 100755 --- a/examples/iota_lens/analysis_iotalens_sdep_aperture.py +++ b/examples/iota_lens/analysis_iotalens_sdep_aperture.py @@ -35,7 +35,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial_beam = series.iterations[1].particles["beam"] final_beam = series.iterations[last_step].particles["beam"] diff --git a/examples/iota_lens/input_iotalens.in b/examples/iota_lens/input_iotalens.in index 74a4304c6..df64d26b3 100644 --- a/examples/iota_lens/input_iotalens.in +++ b/examples/iota_lens/input_iotalens.in @@ -44,7 +44,6 @@ const.ky = 1.0 const.kt = 1.0e-12 monitor.type = beam_monitor -monitor.backend = h5 monitor.nonlinear_lens_invariants = true monitor.alpha = 0.0 monitor.beta = 1.0 diff --git a/examples/iota_lens/input_iotalens_sdep.in b/examples/iota_lens/input_iotalens_sdep.in index 7b160dbcb..c668a553f 100644 --- a/examples/iota_lens/input_iotalens_sdep.in +++ b/examples/iota_lens/input_iotalens_sdep.in @@ -91,7 +91,6 @@ const.nslice = 1 # Beam Monitor: Diagnostics monitor.type = beam_monitor -monitor.backend = h5 monitor.nonlinear_lens_invariants = true monitor.alpha = 1.376381920471173 monitor.beta = 1.892632003628881 diff --git a/examples/iota_lens/input_iotalens_sdep_aperture.in b/examples/iota_lens/input_iotalens_sdep_aperture.in index 8d5c1ef9d..b15313f33 100644 --- a/examples/iota_lens/input_iotalens_sdep_aperture.in +++ b/examples/iota_lens/input_iotalens_sdep_aperture.in @@ -138,7 +138,6 @@ const.nslice = 1 # Beam Monitor: Diagnostics monitor.type = beam_monitor -monitor.backend = h5 monitor.nonlinear_lens_invariants = true monitor.alpha = 1.376381920471173 monitor.beta = 1.892632003628881 diff --git a/examples/iota_lens/run_iotalens.py b/examples/iota_lens/run_iotalens.py index 1f8c448ad..6a2557798 100644 --- a/examples/iota_lens/run_iotalens.py +++ b/examples/iota_lens/run_iotalens.py @@ -40,7 +40,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") monitor.nonlinear_lens_invariants = True monitor.alpha = 0.0 monitor.beta = 1.0 diff --git a/examples/iota_lens/run_iotalens_sdep.py b/examples/iota_lens/run_iotalens_sdep.py index efc153928..ffa5cace4 100644 --- a/examples/iota_lens/run_iotalens_sdep.py +++ b/examples/iota_lens/run_iotalens_sdep.py @@ -46,7 +46,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") monitor.nonlinear_lens_invariants = True monitor.alpha = 1.376381920471173 monitor.beta = 1.892632003628881 diff --git a/examples/iota_lens/run_iotalens_sdep_aperture.py b/examples/iota_lens/run_iotalens_sdep_aperture.py index 4c0496e35..b22237d52 100644 --- a/examples/iota_lens/run_iotalens_sdep_aperture.py +++ b/examples/iota_lens/run_iotalens_sdep_aperture.py @@ -46,7 +46,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") monitor.nonlinear_lens_invariants = True monitor.alpha = 1.376381920471173 monitor.beta = 1.892632003628881 diff --git a/examples/kicker/analysis_kicker.py b/examples/kicker/analysis_kicker.py index c397853b3..92bb1fe59 100755 --- a/examples/kicker/analysis_kicker.py +++ b/examples/kicker/analysis_kicker.py @@ -37,7 +37,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/kicker/input_kicker.in b/examples/kicker/input_kicker.in index db2140ae8..a10f30ec5 100644 --- a/examples/kicker/input_kicker.in +++ b/examples/kicker/input_kicker.in @@ -24,7 +24,6 @@ beam.mutpt = 0.0 lattice.elements = monitor hkick vkick monitor monitor.type = beam_monitor -monitor.backend = h5 hkick.type = kicker hkick.xkick = 2.0e-3 # 2 mrad horizontal kick diff --git a/examples/kicker/run_hvkicker_madx.py b/examples/kicker/run_hvkicker_madx.py index d1030fd9b..1378695af 100644 --- a/examples/kicker/run_hvkicker_madx.py +++ b/examples/kicker/run_hvkicker_madx.py @@ -40,7 +40,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice sim.lattice.load_file("hvkicker.madx", nslice=1) diff --git a/examples/kicker/run_kicker.py b/examples/kicker/run_kicker.py index d6f4dd9a9..6e9dccd60 100644 --- a/examples/kicker/run_kicker.py +++ b/examples/kicker/run_kicker.py @@ -41,7 +41,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice kicklattice = [ diff --git a/examples/kicker/run_kicker_madx.py b/examples/kicker/run_kicker_madx.py index 9c1b958f2..1888db5ec 100644 --- a/examples/kicker/run_kicker_madx.py +++ b/examples/kicker/run_kicker_madx.py @@ -40,7 +40,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice sim.lattice.load_file("kicker.madx", nslice=1) diff --git a/examples/kurth/analysis_kurth.py b/examples/kurth/analysis_kurth.py index aeb077d4f..36ff4a82b 100755 --- a/examples/kurth/analysis_kurth.py +++ b/examples/kurth/analysis_kurth.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/kurth/analysis_kurth_10nC.py b/examples/kurth/analysis_kurth_10nC.py index d41c7bdd5..a18c19545 100755 --- a/examples/kurth/analysis_kurth_10nC.py +++ b/examples/kurth/analysis_kurth_10nC.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/kurth/analysis_kurth_10nC_periodic.py b/examples/kurth/analysis_kurth_10nC_periodic.py index 6a934bdca..70f60ce63 100755 --- a/examples/kurth/analysis_kurth_10nC_periodic.py +++ b/examples/kurth/analysis_kurth_10nC_periodic.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/kurth/analysis_kurth_periodic.py b/examples/kurth/analysis_kurth_periodic.py index b94f1786a..5d5ac2c7d 100755 --- a/examples/kurth/analysis_kurth_periodic.py +++ b/examples/kurth/analysis_kurth_periodic.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/kurth/input_kurth_10nC_periodic.in b/examples/kurth/input_kurth_10nC_periodic.in index dcac80da4..acdb84f3f 100644 --- a/examples/kurth/input_kurth_10nC_periodic.in +++ b/examples/kurth/input_kurth_10nC_periodic.in @@ -24,7 +24,6 @@ lattice.nslice = 20 #lattice.nslice = 30 # optional for increased precision monitor.type = beam_monitor -monitor.backend = h5 drift1.type = drift drift1.ds = 1.0 diff --git a/examples/kurth/input_kurth_10nC_periodic_envelope.in b/examples/kurth/input_kurth_10nC_periodic_envelope.in index 294422f70..524cf51d1 100644 --- a/examples/kurth/input_kurth_10nC_periodic_envelope.in +++ b/examples/kurth/input_kurth_10nC_periodic_envelope.in @@ -20,7 +20,6 @@ lattice.elements = monitor drift1 constf1 drift1 monitor lattice.nslice = 30 # optional for increased precision monitor.type = beam_monitor -monitor.backend = h5 drift1.type = drift drift1.ds = 1.0 diff --git a/examples/kurth/input_kurth_periodic.in b/examples/kurth/input_kurth_periodic.in index e1f073eee..111c98ce8 100644 --- a/examples/kurth/input_kurth_periodic.in +++ b/examples/kurth/input_kurth_periodic.in @@ -21,7 +21,6 @@ beam.lambdaPt = 2.6735334467940146e-3 lattice.elements = monitor drift1 constf1 drift1 monitor monitor.type = beam_monitor -monitor.backend = h5 drift1.type = drift drift1.ds = 1.0 diff --git a/examples/kurth/run_kurth_10nC_periodic.py b/examples/kurth/run_kurth_10nC_periodic.py index 6c2a92dc5..e3051f3f0 100755 --- a/examples/kurth/run_kurth_10nC_periodic.py +++ b/examples/kurth/run_kurth_10nC_periodic.py @@ -43,7 +43,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice nslice = 20 # use 30 for increased precision diff --git a/examples/kurth/run_kurth_10nC_periodic_envelope.py b/examples/kurth/run_kurth_10nC_periodic_envelope.py index 2e4d0925d..c778b126e 100755 --- a/examples/kurth/run_kurth_10nC_periodic_envelope.py +++ b/examples/kurth/run_kurth_10nC_periodic_envelope.py @@ -42,7 +42,7 @@ sim.init_envelope(ref, distr, bunch_charge_C) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice nslice = 30 # use 30 for increased precision diff --git a/examples/kurth/run_kurth_periodic.py b/examples/kurth/run_kurth_periodic.py index 4b19d7887..9124c5259 100755 --- a/examples/kurth/run_kurth_periodic.py +++ b/examples/kurth/run_kurth_periodic.py @@ -42,7 +42,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice constf1 = elements.ConstF(name="constf1", ds=2.0, kx=0.7, ky=0.7, kt=0.7) diff --git a/examples/linac_segment/analysis_linac_segment.py b/examples/linac_segment/analysis_linac_segment.py index 1f483786b..80cc11814 100755 --- a/examples/linac_segment/analysis_linac_segment.py +++ b/examples/linac_segment/analysis_linac_segment.py @@ -35,7 +35,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/linac_segment/input_linac_segment.in b/examples/linac_segment/input_linac_segment.in index 217e48d3a..39073dcba 100644 --- a/examples/linac_segment/input_linac_segment.in +++ b/examples/linac_segment/input_linac_segment.in @@ -33,7 +33,6 @@ hwr_fragment.type = line hwr_fragment.elements = D1b SOL1b D2b RF1b D3b SOL2b D4b monitor.type = beam_monitor -monitor.backend = h5 D1.type = drift D1.ds = 0.17414 diff --git a/examples/linac_segment/run_linac_segment.py b/examples/linac_segment/run_linac_segment.py index ab5d76675..e0c4804bf 100644 --- a/examples/linac_segment/run_linac_segment.py +++ b/examples/linac_segment/run_linac_segment.py @@ -64,7 +64,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # field coefficients QWR_sin_coefs = [ diff --git a/examples/linear_map/analysis_map.py b/examples/linear_map/analysis_map.py index 4de79069f..3d333f094 100755 --- a/examples/linear_map/analysis_map.py +++ b/examples/linear_map/analysis_map.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/linear_map/input_map.in b/examples/linear_map/input_map.in index 67fed5909..cbdf0a432 100644 --- a/examples/linear_map/input_map.in +++ b/examples/linear_map/input_map.in @@ -25,7 +25,6 @@ lattice.periods = 5 lattice.elements = monitor map1 monitor.type = beam_monitor -monitor.backend = h5 map1.type = linear_map # horizontal plane diff --git a/examples/linear_map/run_map.py b/examples/linear_map/run_map.py index cb76c23ae..310580831 100755 --- a/examples/linear_map/run_map.py +++ b/examples/linear_map/run_map.py @@ -54,7 +54,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # initialize the linear map Iden = Map6x6.identity() diff --git a/examples/multipole/analysis_multipole.py b/examples/multipole/analysis_multipole.py index da726cbb6..6a7bf710e 100755 --- a/examples/multipole/analysis_multipole.py +++ b/examples/multipole/analysis_multipole.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/multipole/input_multipole.in b/examples/multipole/input_multipole.in index 63eb5641d..ec3d45fb6 100644 --- a/examples/multipole/input_multipole.in +++ b/examples/multipole/input_multipole.in @@ -24,7 +24,6 @@ beam.mutpt = 0.0 lattice.elements = monitor thin_quadrupole thin_sextupole thin_octupole monitor monitor.type = beam_monitor -monitor.backend = h5 thin_quadrupole.type = multipole thin_quadrupole.multipole = 2 # Thin quadrupole diff --git a/examples/multipole/run_multipole.py b/examples/multipole/run_multipole.py index 0780f53dc..7eef03cf5 100644 --- a/examples/multipole/run_multipole.py +++ b/examples/multipole/run_multipole.py @@ -41,7 +41,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice multipole = [ diff --git a/examples/optimize_triplet/analysis_triplet.py b/examples/optimize_triplet/analysis_triplet.py index 3d7ebbbe1..c12623b84 100755 --- a/examples/optimize_triplet/analysis_triplet.py +++ b/examples/optimize_triplet/analysis_triplet.py @@ -35,7 +35,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/optimize_triplet/run_triplet.py b/examples/optimize_triplet/run_triplet.py index 3b52f3486..8e25d6ba0 100755 --- a/examples/optimize_triplet/run_triplet.py +++ b/examples/optimize_triplet/run_triplet.py @@ -53,7 +53,7 @@ def build_lattice(parameters: tuple, write_particles: bool) -> list: ] if write_particles: - monitor = elements.BeamMonitor("monitor", backend="h5") + monitor = elements.BeamMonitor("monitor") line = [monitor] + line + [monitor] return line diff --git a/examples/positron_channel/analysis_positron.py b/examples/positron_channel/analysis_positron.py index 42174effc..8f8e8f23f 100755 --- a/examples/positron_channel/analysis_positron.py +++ b/examples/positron_channel/analysis_positron.py @@ -35,7 +35,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/positron_channel/input_positron.in b/examples/positron_channel/input_positron.in index ba7b52703..eb3e90e4f 100644 --- a/examples/positron_channel/input_positron.in +++ b/examples/positron_channel/input_positron.in @@ -26,7 +26,6 @@ lattice.elements = monitor quad1 drift1 quad2 drift1 quad1 drift2 unifacc drift2 lattice.nslice = 1 monitor.type = beam_monitor -monitor.backend = h5 quad1.type = quad_chromatic quad1.ds = 0.1 diff --git a/examples/positron_channel/run_positron.py b/examples/positron_channel/run_positron.py index e6b432946..b05befad7 100755 --- a/examples/positron_channel/run_positron.py +++ b/examples/positron_channel/run_positron.py @@ -44,7 +44,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice) ns = 1 # number of slices per ds in the element diff --git a/examples/pytorch_surrogate_model/analyze_ml_surrogate_15_stage.py b/examples/pytorch_surrogate_model/analyze_ml_surrogate_15_stage.py index db736153b..a352236a7 100644 --- a/examples/pytorch_surrogate_model/analyze_ml_surrogate_15_stage.py +++ b/examples/pytorch_surrogate_model/analyze_ml_surrogate_15_stage.py @@ -35,7 +35,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/pytorch_surrogate_model/run_ml_surrogate_15_stage.py b/examples/pytorch_surrogate_model/run_ml_surrogate_15_stage.py index 580cebb66..2b2c4d5ac 100644 --- a/examples/pytorch_surrogate_model/run_ml_surrogate_15_stage.py +++ b/examples/pytorch_surrogate_model/run_ml_surrogate_15_stage.py @@ -332,7 +332,7 @@ def set_lens(self, pc, step, period): lpa.threadsafe = False lpa_stages.append(lpa) -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") for i in range(N_stage): sim.lattice.extend( [ diff --git a/examples/pytorch_surrogate_model/visualize_ml_surrogate_15_stage.py b/examples/pytorch_surrogate_model/visualize_ml_surrogate_15_stage.py index 8b3fa0d4a..0721b756d 100644 --- a/examples/pytorch_surrogate_model/visualize_ml_surrogate_15_stage.py +++ b/examples/pytorch_surrogate_model/visualize_ml_surrogate_15_stage.py @@ -395,7 +395,7 @@ def plot_beam_df( ######## plot phase spaces ########### beam_impactx_surrogate_series = io.Series( - "diags/openPMD/monitor.h5", io.Access.read_only + "diags/openPMD/monitor.%E", io.Access.read_only ) impactx_surrogate_steps = list(beam_impactx_surrogate_series.iterations) diff --git a/examples/quadrupole_softedge/analysis_quadrupole_softedge.py b/examples/quadrupole_softedge/analysis_quadrupole_softedge.py index 77ba45b07..6fb1e77d0 100755 --- a/examples/quadrupole_softedge/analysis_quadrupole_softedge.py +++ b/examples/quadrupole_softedge/analysis_quadrupole_softedge.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/quadrupole_softedge/input_quadrupole_softedge.in b/examples/quadrupole_softedge/input_quadrupole_softedge.in index 017857aa6..700211d85 100644 --- a/examples/quadrupole_softedge/input_quadrupole_softedge.in +++ b/examples/quadrupole_softedge/input_quadrupole_softedge.in @@ -25,7 +25,6 @@ lattice.elements = monitor drift1 quad1 drift2 quad2 drift1 monitor lattice.nslice = 1 monitor.type = beam_monitor -monitor.backend = h5 drift1.type = drift drift1.ds = 0.25 diff --git a/examples/quadrupole_softedge/run_quadrupole_softedge.py b/examples/quadrupole_softedge/run_quadrupole_softedge.py index 4b2b96de6..a7a678135 100755 --- a/examples/quadrupole_softedge/run_quadrupole_softedge.py +++ b/examples/quadrupole_softedge/run_quadrupole_softedge.py @@ -44,7 +44,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice ns = 1 # number of slices per ds in the element diff --git a/examples/rfcavity/analysis_rfcavity.py b/examples/rfcavity/analysis_rfcavity.py index 88c62c32c..205a12ab3 100755 --- a/examples/rfcavity/analysis_rfcavity.py +++ b/examples/rfcavity/analysis_rfcavity.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/rfcavity/input_rfcavity.in b/examples/rfcavity/input_rfcavity.in index cec21bc14..adda04686 100644 --- a/examples/rfcavity/input_rfcavity.in +++ b/examples/rfcavity/input_rfcavity.in @@ -24,7 +24,6 @@ beam.mutpt = -5.05773e-10 lattice.elements = monitor dr1 dr2 rf dr2 dr2 rf dr2 dr2 rf dr2 dr2 rf dr2 monitor monitor.type = beam_monitor -monitor.backend = h5 dr1.type = drift dr1.ds = 0.4 diff --git a/examples/rfcavity/run_rfcavity.py b/examples/rfcavity/run_rfcavity.py index 69911fd26..82108e1ba 100755 --- a/examples/rfcavity/run_rfcavity.py +++ b/examples/rfcavity/run_rfcavity.py @@ -115,7 +115,7 @@ ) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") sim.lattice.extend( [ diff --git a/examples/rotation/analysis_rotation.py b/examples/rotation/analysis_rotation.py index 905d6fefc..aff652e04 100755 --- a/examples/rotation/analysis_rotation.py +++ b/examples/rotation/analysis_rotation.py @@ -35,7 +35,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/rotation/analysis_rotation_xy.py b/examples/rotation/analysis_rotation_xy.py index b40a3ed5d..f8bb029de 100755 --- a/examples/rotation/analysis_rotation_xy.py +++ b/examples/rotation/analysis_rotation_xy.py @@ -35,7 +35,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/rotation/input_rotation.in b/examples/rotation/input_rotation.in index ec5e01cc1..ca2b47d8e 100644 --- a/examples/rotation/input_rotation.in +++ b/examples/rotation/input_rotation.in @@ -21,7 +21,6 @@ beam.lambdaPt = 2.0e-3 lattice.elements = monitor rotation1 drift1 rotation2 monitor monitor.type = beam_monitor -monitor.backend = h5 drift1.type = drift drift1.ds = 2.0 diff --git a/examples/rotation/input_rotation_xy.in b/examples/rotation/input_rotation_xy.in index 2b129487b..78ed57321 100644 --- a/examples/rotation/input_rotation_xy.in +++ b/examples/rotation/input_rotation_xy.in @@ -21,7 +21,6 @@ beam.lambdaPt = 2.0e-3 lattice.elements = monitor rotation1 monitor monitor.type = beam_monitor -monitor.backend = h5 rotation1.type = plane_xyrotation rotation1.angle = 90.0 diff --git a/examples/rotation/run_rotation.py b/examples/rotation/run_rotation.py index 11a3336dd..75429be6c 100644 --- a/examples/rotation/run_rotation.py +++ b/examples/rotation/run_rotation.py @@ -41,7 +41,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice rotated_drift = [ diff --git a/examples/rotation/run_rotation_xy.py b/examples/rotation/run_rotation_xy.py index 586832a6d..c036c3caa 100644 --- a/examples/rotation/run_rotation_xy.py +++ b/examples/rotation/run_rotation_xy.py @@ -41,7 +41,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # 90 degree rotation rotation = elements.PlaneXYRot(name="rotation1", angle=90.0) diff --git a/examples/scraping_beam/analysis_scraping.py b/examples/scraping_beam/analysis_scraping.py index 2a8d21391..e0568917b 100755 --- a/examples/scraping_beam/analysis_scraping.py +++ b/examples/scraping_beam/analysis_scraping.py @@ -45,7 +45,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial_beam = series.iterations[1].particles["beam"] final_beam = series.iterations[last_step].particles["beam"] diff --git a/examples/scraping_beam/input_scraping.in b/examples/scraping_beam/input_scraping.in index 07ca6f71f..b9ab4a327 100644 --- a/examples/scraping_beam/input_scraping.in +++ b/examples/scraping_beam/input_scraping.in @@ -34,7 +34,6 @@ drift1.aperture_x = 3.5e-3 drift1.aperture_y = 3.5e-3 monitor.type = beam_monitor -monitor.backend = h5 ############################################################################### diff --git a/examples/scraping_beam/run_scraping.py b/examples/scraping_beam/run_scraping.py index 69dbbc95e..e26a25189 100755 --- a/examples/scraping_beam/run_scraping.py +++ b/examples/scraping_beam/run_scraping.py @@ -58,7 +58,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # initialize the linear map Iden = Map6x6.identity() diff --git a/examples/solenoid/analysis_solenoid.py b/examples/solenoid/analysis_solenoid.py index 7de599f81..0e2c0d3b4 100755 --- a/examples/solenoid/analysis_solenoid.py +++ b/examples/solenoid/analysis_solenoid.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/solenoid/input_solenoid.in b/examples/solenoid/input_solenoid.in index 761f5a156..9a4667f49 100644 --- a/examples/solenoid/input_solenoid.in +++ b/examples/solenoid/input_solenoid.in @@ -25,7 +25,6 @@ lattice.elements = monitor sol1 monitor lattice.nslice = 1 monitor.type = beam_monitor -monitor.backend = h5 sol1.type = solenoid sol1.ds = 3.820395 diff --git a/examples/solenoid/run_solenoid.py b/examples/solenoid/run_solenoid.py index c142a629e..d5cd574d2 100755 --- a/examples/solenoid/run_solenoid.py +++ b/examples/solenoid/run_solenoid.py @@ -42,7 +42,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice sim.lattice.extend( diff --git a/examples/solenoid_restart/analysis_solenoid.py b/examples/solenoid_restart/analysis_solenoid.py index c5bb2ec55..f2edd9d5f 100755 --- a/examples/solenoid_restart/analysis_solenoid.py +++ b/examples/solenoid_restart/analysis_solenoid.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) first_step = list(series.iterations)[0] last_step = list(series.iterations)[-1] initial = series.iterations[first_step].particles["beam"].to_df() diff --git a/examples/solenoid_restart/input_solenoid.in b/examples/solenoid_restart/input_solenoid.in index bd2e9df1f..8b4533252 100644 --- a/examples/solenoid_restart/input_solenoid.in +++ b/examples/solenoid_restart/input_solenoid.in @@ -18,10 +18,9 @@ lattice.nslice = 1 source.type = source source.distribution = openPMD -source.openpmd_path = "../solenoid/diags/openPMD/monitor.h5" +source.openpmd_path = "../solenoid/diags/openPMD/monitor.%E" monitor.type = beam_monitor -monitor.backend = h5 sol1.type = solenoid sol1.ds = 3.820395 diff --git a/examples/solenoid_restart/run_solenoid.py b/examples/solenoid_restart/run_solenoid.py index 8627cd60c..dc3b97f06 100755 --- a/examples/solenoid_restart/run_solenoid.py +++ b/examples/solenoid_restart/run_solenoid.py @@ -30,10 +30,10 @@ ref.set_charge_qe(1.0).set_mass_MeV(938.27208816).set_kin_energy_MeV(kin_energy_MeV) # load particle bunch from file -push(pc, elements.Source("openPMD", "../solenoid.py/diags/openPMD/monitor.h5")) +push(pc, elements.Source("openPMD", "../solenoid.py/diags/openPMD/monitor.%E")) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice sol1 = elements.Sol(name="sol1", ds=3.820395, ks=0.8223219329893234) diff --git a/examples/solenoid_softedge/analysis_solenoid_softedge.py b/examples/solenoid_softedge/analysis_solenoid_softedge.py index c2e700ab2..e972f099d 100755 --- a/examples/solenoid_softedge/analysis_solenoid_softedge.py +++ b/examples/solenoid_softedge/analysis_solenoid_softedge.py @@ -34,7 +34,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/solenoid_softedge/input_solenoid_softedge.in b/examples/solenoid_softedge/input_solenoid_softedge.in index d223a721e..f13121564 100644 --- a/examples/solenoid_softedge/input_solenoid_softedge.in +++ b/examples/solenoid_softedge/input_solenoid_softedge.in @@ -25,7 +25,6 @@ lattice.elements = monitor sol1 monitor lattice.nslice = 1 monitor.type = beam_monitor -monitor.backend = h5 sol1.type = solenoid_softedge sol1.ds = 6.0 diff --git a/examples/solenoid_softedge/run_solenoid_softedge.py b/examples/solenoid_softedge/run_solenoid_softedge.py index e824b5f00..af960b0be 100755 --- a/examples/solenoid_softedge/run_solenoid_softedge.py +++ b/examples/solenoid_softedge/run_solenoid_softedge.py @@ -125,7 +125,7 @@ ) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") sim.lattice.extend( [ diff --git a/examples/thin_dipole/analysis_thin_dipole.py b/examples/thin_dipole/analysis_thin_dipole.py index 64e614e8c..5dbf9e0fb 100755 --- a/examples/thin_dipole/analysis_thin_dipole.py +++ b/examples/thin_dipole/analysis_thin_dipole.py @@ -35,7 +35,7 @@ def get_moments(beam): # initial/final beam -series = io.Series("diags/openPMD/monitor.h5", io.Access.read_only) +series = io.Series("diags/openPMD/monitor.%E", io.Access.read_only) last_step = list(series.iterations)[-1] initial = series.iterations[1].particles["beam"].to_df() final = series.iterations[last_step].particles["beam"].to_df() diff --git a/examples/thin_dipole/input_thin_dipole.in b/examples/thin_dipole/input_thin_dipole.in index 7d393085e..4adfcf0f4 100644 --- a/examples/thin_dipole/input_thin_dipole.in +++ b/examples/thin_dipole/input_thin_dipole.in @@ -25,7 +25,6 @@ lattice.elements = monitor bend inverse_bend monitor lattice.nslice = 1 monitor.type = beam_monitor -monitor.backend = h5 #90 degree sbend using drift-kick-drift: bend.type = line diff --git a/examples/thin_dipole/run_thin_dipole.py b/examples/thin_dipole/run_thin_dipole.py index afb21f344..ed1cb6668 100755 --- a/examples/thin_dipole/run_thin_dipole.py +++ b/examples/thin_dipole/run_thin_dipole.py @@ -43,7 +43,7 @@ sim.add_particles(bunch_charge_C, distr, npart) # add beam diagnostics -monitor = elements.BeamMonitor("monitor", backend="h5") +monitor = elements.BeamMonitor("monitor") # design the accelerator lattice) ns = 1 # number of slices per ds in the element diff --git a/src/python/impactx/madx_to_impactx.py b/src/python/impactx/madx_to_impactx.py index 59c1da1bb..6b060f820 100644 --- a/src/python/impactx/madx_to_impactx.py +++ b/src/python/impactx/madx_to_impactx.py @@ -110,7 +110,7 @@ def lattice(parsed_beamline, nslice=1): ) ) impactx_beamline.append( - elements.BeamMonitor(name="monitor", backend="h5") + elements.BeamMonitor(name="monitor") ) # TODO: use name=d["name"] ? else: raise NotImplementedError( diff --git a/tests/python/test_lattice_insert.py b/tests/python/test_lattice_insert.py index 310d4c2aa..9b33b65a8 100644 --- a/tests/python/test_lattice_insert.py +++ b/tests/python/test_lattice_insert.py @@ -15,7 +15,7 @@ def test_element_insert(): """ This tests the lattice element insert every ds elements. """ - monitor = elements.BeamMonitor("monitor", backend="h5") + monitor = elements.BeamMonitor("monitor") fodo = [ elements.Drift(name="drift1", ds=0.25), diff --git a/tests/python/test_xopt.py b/tests/python/test_xopt.py index f39f05042..2445b7c24 100644 --- a/tests/python/test_xopt.py +++ b/tests/python/test_xopt.py @@ -55,7 +55,7 @@ def build_lattice(parameters: dict, write_particles: bool) -> list: ] if write_particles: - monitor = elements.BeamMonitor("monitor", backend="h5") + monitor = elements.BeamMonitor("monitor") line = [monitor] + line + [monitor] return line From cf55096d573106555518c979866cc46792a87ee0 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Fri, 21 Mar 2025 15:34:53 -0700 Subject: [PATCH 2/2] CI: Windows/macOS Print openPMD-api Version Outdated? Regex issue? --- .github/workflows/macos.yml | 1 + .github/workflows/windows.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index bcaae3d72..269124645 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -45,6 +45,7 @@ jobs: python3 -m pip install --upgrade -r tests/python/requirements.txt python3 -m pip install --upgrade pipx python3 -m pipx install openPMD-validator + python3 -c "import openpmd_api as io; print(io.__version__)" - name: CCache Cache uses: actions/cache@v4 # - once stored under a key, they become immutable (even if local cache path content changes) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c1bb41342..84450027a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -87,6 +87,7 @@ jobs: python3 -m pip install -U -r examples/requirements.txt python3 -m pip install -U -r tests/python/requirements.txt python3 -m pip install -U openPMD-validator + python3 -c "import openpmd_api as io; print(io.__version__)" - name: Build env: # Work-around for windows-latest GH runner issue, see @@ -209,6 +210,7 @@ jobs: python3 -m pip install -U -r examples/requirements.txt python3 -m pip install -U -r tests/python/requirements.txt python3 -m pip install -U openPMD-validator + python3 -c "import openpmd_api as io; print(io.__version__)" - name: Build shell: cmd env: