From 68efd71e95c1188fd0bd4680c292c93866f0f230 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 9 Jan 2025 13:42:51 -0800 Subject: [PATCH] Examples: Use Parser Where Sensible --- .../achromatic_spectrometer/input_spectrometer.in | 4 ++-- examples/alignment/input_alignment.in | 4 ++-- examples/apochromatic/input_apochromatic.in | 6 +++--- examples/apochromatic/input_apochromatic_pl.in | 6 +++--- examples/cfbend/input_cfbend.in | 12 ++++++------ examples/cfchannel/input_cfchannel.in | 4 ++-- examples/cfchannel/input_cfchannel_10nC_fft.in | 4 ++-- examples/cfchannel/input_cfchannel_10nC_mlmg.in | 4 ++-- examples/chicane/input_chicane.in | 2 +- examples/chicane/input_chicane_csr.in | 2 +- examples/compression/input_compression.in | 4 ++-- examples/coupled_optics/input_coupled_optics.in | 2 +- examples/cyclotron/input_cyclotron.in | 4 ++-- examples/distgen/input_gaussian_twiss.in | 4 ++-- examples/distgen/input_kurth4d.in | 4 ++-- examples/distgen/input_kvdist_twiss.in | 6 +++--- examples/distgen/input_semigaussian.in | 6 +++--- examples/dogleg/input_dogleg.in | 12 ++++++------ examples/epac2004_benchmarks/input_bithermal.in | 4 ++-- examples/epac2004_benchmarks/input_fodo_rf_SC.in | 2 +- examples/epac2004_benchmarks/input_thermal.in | 4 ++-- examples/expanding_beam/input_expanding_fft.in | 2 +- examples/expanding_beam/input_expanding_mlmg.in | 2 +- examples/fodo/input_fodo.in | 6 +++--- examples/fodo/input_fodo_twiss.in | 6 +++--- examples/fodo_channel/input_fodo.in | 6 +++--- examples/fodo_chromatic/input_fodo_chr.in | 6 +++--- examples/fodo_tune/input_fodo_tune.in | 6 +++--- examples/iota_lens/input_iotalens.in | 4 ++-- examples/iota_lens/input_iotalens_sdep.in | 8 ++++---- examples/kicker/input_kicker.in | 4 ++-- examples/kurth/input_kurth_10nC_periodic.in | 8 ++++---- examples/kurth/input_kurth_periodic.in | 8 ++++---- examples/linac_segment/input_linac_segment.in | 2 +- examples/multipole/input_multipole.in | 10 +++++----- examples/positron_channel/input_positron.in | 4 ++-- .../quadrupole_softedge/input_quadrupole_softedge.in | 6 +++--- examples/rotation/input_rotation.in | 4 ++-- examples/thin_dipole/input_thin_dipole.in | 6 +++--- 39 files changed, 99 insertions(+), 99 deletions(-) diff --git a/examples/achromatic_spectrometer/input_spectrometer.in b/examples/achromatic_spectrometer/input_spectrometer.in index 90a032c75..3acb4113e 100644 --- a/examples/achromatic_spectrometer/input_spectrometer.in +++ b/examples/achromatic_spectrometer/input_spectrometer.in @@ -8,10 +8,10 @@ beam.charge = 1.0e-9 beam.particle = electron beam.distribution = waterbag beam.lambdaX = 3.162277660e-6 -beam.lambdaY = 3.162277660e-6 +beam.lambdaY = beam.lambdaX beam.lambdaT = 1.0e-3 beam.lambdaPx = 3.16227766017e-4 -beam.lambdaPy = 3.16227766017e-4 +beam.lambdaPy = beam.lambdaPx beam.lambdaPt = 2.0e-2 beam.muxpx = 0.0 beam.muypy = 0.0 diff --git a/examples/alignment/input_alignment.in b/examples/alignment/input_alignment.in index 19a5339b5..1ef1cfe05 100644 --- a/examples/alignment/input_alignment.in +++ b/examples/alignment/input_alignment.in @@ -8,10 +8,10 @@ beam.charge = 1.0e-9 beam.particle = proton beam.distribution = waterbag beam.lambdaX = 1.16098260008648811e-3 -beam.lambdaY = 1.16098260008648811e-3 +beam.lambdaY = beam.lambdaX beam.lambdaT = 1.0e-3 beam.lambdaPx = 0.580491300043e-3 -beam.lambdaPy = 0.580491300043e-3 +beam.lambdaPy = beam.lambdaPx beam.lambdaPt = 2.0e-3 beam.muxpx = 0.0 beam.muypy = 0.0 diff --git a/examples/apochromatic/input_apochromatic.in b/examples/apochromatic/input_apochromatic.in index dad950167..7a396cbde 100644 --- a/examples/apochromatic/input_apochromatic.in +++ b/examples/apochromatic/input_apochromatic.in @@ -8,11 +8,11 @@ beam.charge = 1.0e-9 beam.particle = electron beam.distribution = gaussian beam.lambdaX = 1.288697604e-6 -beam.lambdaY = 1.288697604e-6 +beam.lambdaY = beam.lambdaX beam.lambdaT = 1.0e-6 beam.lambdaPx = 3.965223396e-6 -beam.lambdaPy = 3.965223396e-6 -beam.lambdaPt = 0.01 #1% energy spread +beam.lambdaPy = beam.lambdaPx +beam.lambdaPt = 0.01 # 1% energy spread beam.muxpx = 0.0 beam.muypy = 0.0 beam.mutpt = 0.0 diff --git a/examples/apochromatic/input_apochromatic_pl.in b/examples/apochromatic/input_apochromatic_pl.in index 750166ab2..ef6b3a2a9 100644 --- a/examples/apochromatic/input_apochromatic_pl.in +++ b/examples/apochromatic/input_apochromatic_pl.in @@ -8,11 +8,11 @@ beam.charge = 1.0e-9 beam.particle = electron beam.distribution = gaussian beam.lambdaX = 1.288697604e-6 -beam.lambdaY = 1.288697604e-6 +beam.lambdaY = beam.lambdaX beam.lambdaT = 1.0e-6 beam.lambdaPx = 3.965223396e-6 -beam.lambdaPy = 3.965223396e-6 -beam.lambdaPt = 0.01 #1% energy spread +beam.lambdaPy = beam.lambdaPx +beam.lambdaPt = 0.01 # 1% energy spread beam.muxpx = 0.0 beam.muypy = 0.0 beam.mutpt = 0.0 diff --git a/examples/cfbend/input_cfbend.in b/examples/cfbend/input_cfbend.in index b809b89d7..325a557a8 100644 --- a/examples/cfbend/input_cfbend.in +++ b/examples/cfbend/input_cfbend.in @@ -7,12 +7,12 @@ beam.kin_energy = 2.0e3 #2 GeV beam.charge = 1.0e-9 beam.particle = electron beam.distribution = waterbag -beam.lambdaX = 5.0e-6 #5 um -beam.lambdaY = 8.0e-6 #8 um -beam.lambdaT = 0.0599584916 #200 ps -beam.lambdaPx = 2.5543422003e-9 #exn = 50 pm-rad -beam.lambdaPy = 1.5964638752e-9 #eyn = 50 pm-rad -beam.lambdaPt = 9.0e-4 #approximately dE/E +beam.lambdaX = 5.0e-6 # 5 um +beam.lambdaY = 8.0e-6 # 8 um +beam.lambdaT = 0.0599584916 # 200 ps +beam.lambdaPx = 2.5543422003e-9 # exn = 50 pm-rad +beam.lambdaPy = 1.5964638752e-9 # eyn = 50 pm-rad +beam.lambdaPt = 9.0e-4 # approximately dE/E beam.muxpx = 0.0 beam.muypy = 0.0 beam.mutpt = 0.0 diff --git a/examples/cfchannel/input_cfchannel.in b/examples/cfchannel/input_cfchannel.in index c9fcef412..6c6d06705 100644 --- a/examples/cfchannel/input_cfchannel.in +++ b/examples/cfchannel/input_cfchannel.in @@ -8,10 +8,10 @@ beam.charge = 1.0e-9 beam.particle = proton beam.distribution = waterbag beam.lambdaX = 1.0e-3 -beam.lambdaY = 1.0e-3 +beam.lambdaY = beam.lambdaX beam.lambdaT = 3.369701494258956e-4 beam.lambdaPx = 1.0e-3 -beam.lambdaPy = 1.0e-3 +beam.lambdaPy = beam.lambdaPx beam.lambdaPt = 2.9676219145931020e-3 beam.muxpx = 0.0 beam.muypy = 0.0 diff --git a/examples/cfchannel/input_cfchannel_10nC_fft.in b/examples/cfchannel/input_cfchannel_10nC_fft.in index fea309698..5b93893b9 100644 --- a/examples/cfchannel/input_cfchannel_10nC_fft.in +++ b/examples/cfchannel/input_cfchannel_10nC_fft.in @@ -9,10 +9,10 @@ beam.charge = 1.0e-8 beam.particle = proton beam.distribution = waterbag beam.lambdaX = 1.2154443728379865788e-3 -beam.lambdaY = 1.2154443728379865788e-3 +beam.lambdaY = beam.lambdaX beam.lambdaT = 4.0956844276541331005e-4 beam.lambdaPx = 8.2274435782286157175e-4 -beam.lambdaPy = 8.2274435782286157175e-4 +beam.lambdaPy = beam.lambdaPx beam.lambdaPt = 2.4415943602685364584e-3 diff --git a/examples/cfchannel/input_cfchannel_10nC_mlmg.in b/examples/cfchannel/input_cfchannel_10nC_mlmg.in index ad4ef7400..36d39811c 100644 --- a/examples/cfchannel/input_cfchannel_10nC_mlmg.in +++ b/examples/cfchannel/input_cfchannel_10nC_mlmg.in @@ -9,10 +9,10 @@ beam.charge = 1.0e-8 beam.particle = proton beam.distribution = waterbag beam.lambdaX = 1.2154443728379865788e-3 -beam.lambdaY = 1.2154443728379865788e-3 +beam.lambdaY = beam.lambdaX beam.lambdaT = 4.0956844276541331005e-4 beam.lambdaPx = 8.2274435782286157175e-4 -beam.lambdaPy = 8.2274435782286157175e-4 +beam.lambdaPy = beam.lambdaPx beam.lambdaPt = 2.4415943602685364584e-3 diff --git a/examples/chicane/input_chicane.in b/examples/chicane/input_chicane.in index 430a1e944..c29b0ee33 100644 --- a/examples/chicane/input_chicane.in +++ b/examples/chicane/input_chicane.in @@ -14,7 +14,7 @@ beam.lambdaPx = 1.598353425e-6 beam.lambdaPy = 2.803697378e-6 beam.lambdaPt = 2.000000000e-6 beam.muxpx = 0.933345606203060 -beam.muypy = 0.933345606203060 +beam.muypy = beam.muxpx beam.mutpt = 0.999999961419755 diff --git a/examples/chicane/input_chicane_csr.in b/examples/chicane/input_chicane_csr.in index 43e823d94..103373909 100644 --- a/examples/chicane/input_chicane_csr.in +++ b/examples/chicane/input_chicane_csr.in @@ -14,7 +14,7 @@ beam.lambdaPx = 1.598353425e-6 beam.lambdaPy = 2.803697378e-6 beam.lambdaPt = 2.000000000e-6 beam.muxpx = 0.933345606203060 -beam.muypy = 0.933345606203060 +beam.muypy = beam.muxpx beam.mutpt = 0.999999961419755 diff --git a/examples/compression/input_compression.in b/examples/compression/input_compression.in index d83ff12df..fc52eca68 100644 --- a/examples/compression/input_compression.in +++ b/examples/compression/input_compression.in @@ -8,10 +8,10 @@ beam.charge = 1.0e-9 beam.particle = electron beam.distribution = waterbag beam.lambdaX = 0.5e-3 -beam.lambdaY = 0.5e-3 +beam.lambdaY = beam.lambdaX beam.lambdaT = 5.0e-3 beam.lambdaPx = 1.0e-5 -beam.lambdaPy = 1.0e-5 +beam.lambdaPy = beam.lambdaPx beam.lambdaPt = 4.0e-6 beam.muxpx = 0.0 beam.muypy = 0.0 diff --git a/examples/coupled_optics/input_coupled_optics.in b/examples/coupled_optics/input_coupled_optics.in index f0ee840c4..dbe2cd328 100644 --- a/examples/coupled_optics/input_coupled_optics.in +++ b/examples/coupled_optics/input_coupled_optics.in @@ -14,7 +14,7 @@ beam.lambdaPx = 1.598353425e-6 beam.lambdaPy = 2.803697378e-6 beam.lambdaPt = 2.000000000e-6 beam.muxpx = 0.933345606203060 -beam.muypy = 0.933345606203060 +beam.muypy = beam.muxpx beam.mutpt = 0.999999961419755 diff --git a/examples/cyclotron/input_cyclotron.in b/examples/cyclotron/input_cyclotron.in index db5490b21..8ca40b66e 100644 --- a/examples/cyclotron/input_cyclotron.in +++ b/examples/cyclotron/input_cyclotron.in @@ -8,10 +8,10 @@ beam.charge = 1.0e-9 beam.particle = proton beam.distribution = waterbag beam.lambdaX = 1.0e-3 -beam.lambdaY = 1.0e-3 +beam.lambdaY = beam.lambdaX beam.lambdaT = 0.3 beam.lambdaPx = 2.0e-4 -beam.lambdaPy = 2.0e-4 +beam.lambdaPy = beam.lambdaPx beam.lambdaPt = 2.0e-5 beam.muxpx = 0.0 beam.muypy = 0.0 diff --git a/examples/distgen/input_gaussian_twiss.in b/examples/distgen/input_gaussian_twiss.in index 71884d95d..b0f68d3d3 100644 --- a/examples/distgen/input_gaussian_twiss.in +++ b/examples/distgen/input_gaussian_twiss.in @@ -11,10 +11,10 @@ beam.alphaX = -1.5905003499999992 beam.alphaY = 1.5905003499999992 beam.alphaT = 0.0 beam.betaX = 2.8216194100262637 -beam.betaY = 2.8216194100262637 +beam.betaY = beam.betaX beam.betaT = 0.5 beam.emittX = 2e-09 -beam.emittY = 2e-09 +beam.emittY = beam.emittX beam.emittT = 2e-06 diff --git a/examples/distgen/input_kurth4d.in b/examples/distgen/input_kurth4d.in index e82bbd1f4..e53a4a65e 100644 --- a/examples/distgen/input_kurth4d.in +++ b/examples/distgen/input_kurth4d.in @@ -8,10 +8,10 @@ beam.charge = 1.0e-9 beam.particle = proton beam.distribution = kurth4d beam.lambdaX = 1.0e-3 -beam.lambdaY = 1.0e-3 +beam.lambdaY = beam.lambdaX beam.lambdaT = 1.0e-3 beam.lambdaPx = 1.0e-3 -beam.lambdaPy = 1.0e-3 +beam.lambdaPy = beam.lambdaPx beam.lambdaPt = 2.0e-3 beam.muxpx = 0.0 beam.muypy = 0.0 diff --git a/examples/distgen/input_kvdist_twiss.in b/examples/distgen/input_kvdist_twiss.in index aedf9f9a6..8dbce72f7 100644 --- a/examples/distgen/input_kvdist_twiss.in +++ b/examples/distgen/input_kvdist_twiss.in @@ -8,13 +8,13 @@ beam.charge = 1.0e-9 beam.particle = electron beam.distribution = kvdist_from_twiss beam.alphaX = -1.5905003499999992 -beam.alphaY = 1.5905003499999992 +beam.alphaY = -beam.alphaX beam.alphaT = 0.0 beam.betaX = 2.8216194100262637 -beam.betaY = 2.8216194100262637 +beam.betaY = beam.betaX beam.betaT = 0.5 beam.emittX = 2e-09 -beam.emittY = 2e-09 +beam.emittY = beam.emittX beam.emittT = 2e-06 diff --git a/examples/distgen/input_semigaussian.in b/examples/distgen/input_semigaussian.in index 99ccac82d..734458c6b 100644 --- a/examples/distgen/input_semigaussian.in +++ b/examples/distgen/input_semigaussian.in @@ -8,13 +8,13 @@ beam.charge = 1.0e-9 beam.particle = electron beam.distribution = gaussian beam.lambdaX = 3.9984884770e-5 -beam.lambdaY = 3.9984884770e-5 +beam.lambdaY = beam.lambdaX beam.lambdaT = 1.0e-3 beam.lambdaPx = 2.6623538760e-5 -beam.lambdaPy = 2.6623538760e-5 +beam.lambdaPy = beam.lambdaPx beam.lambdaPt = 2.0e-3 beam.muxpx = -0.846574929020762 -beam.muypy = 0.846574929020762 +beam.muypy = -beam.muxpx beam.mutpt = 0.0 diff --git a/examples/dogleg/input_dogleg.in b/examples/dogleg/input_dogleg.in index 93d80e198..347b7f59b 100644 --- a/examples/dogleg/input_dogleg.in +++ b/examples/dogleg/input_dogleg.in @@ -14,7 +14,7 @@ beam.lambdaPx = 1.598353425e-6 beam.lambdaPy = 2.803697378e-6 beam.lambdaPt = 2.000000000e-6 beam.muxpx = 0.933345606203060 -beam.muypy = 0.933345606203060 +beam.muypy = beam.muxpx beam.mutpt = 0.999999961419755 @@ -29,11 +29,11 @@ sbend1.ds = 0.500194828041958 # projected length 0.5 m, angle 2.77 deg sbend1.rc = -10.3462283686195526 drift1.type = drift -drift1.ds = 5.0058489435 # projected length 5 m +drift1.ds = 5.0058489435 # projected length 5 m sbend2.type = sbend -sbend2.ds = 0.500194828041958 # projected length 0.5 m, angle 2.77 deg -sbend2.rc = 10.3462283686195526 +sbend2.ds = sbend1.ds # projected length 0.5 m, angle 2.77 deg +sbend2.rc = -sbend1.rc drift2.type = drift drift2.ds = 0.5 @@ -45,8 +45,8 @@ dipedge1.g = 0.0 dipedge1.K2 = 0.0 dipedge2.type = dipedge -dipedge2.psi = 0.048345620280243 -dipedge2.rc = 10.3462283686195526 +dipedge2.psi = -dipedge1.psi +dipedge2.rc = -dipedge1.rc dipedge2.g = 0.0 dipedge2.K2 = 0.0 diff --git a/examples/epac2004_benchmarks/input_bithermal.in b/examples/epac2004_benchmarks/input_bithermal.in index 2f540ea88..928b80467 100644 --- a/examples/epac2004_benchmarks/input_bithermal.in +++ b/examples/epac2004_benchmarks/input_bithermal.in @@ -27,8 +27,8 @@ monitor.backend = h5 constf1.type = constf constf1.ds = 10.0 constf1.kx = 6.283185307179586 -constf1.ky = 6.283185307179586 -constf1.kt = 6.283185307179586 +constf1.ky = constf1.kx +constf1.kt = constf1.kx #constf1.nslice = 400 #full resolution constf1.nslice = 50 diff --git a/examples/epac2004_benchmarks/input_fodo_rf_SC.in b/examples/epac2004_benchmarks/input_fodo_rf_SC.in index c6efdb395..6e6cf533f 100644 --- a/examples/epac2004_benchmarks/input_fodo_rf_SC.in +++ b/examples/epac2004_benchmarks/input_fodo_rf_SC.in @@ -37,7 +37,7 @@ fquad.nslice = 6 dquad.type = quad dquad.ds = 0.3 -dquad.k = -2.4669749766168163 +dquad.k = -fquad.k dquad.nslice = 12 gapa1.type = rfcavity diff --git a/examples/epac2004_benchmarks/input_thermal.in b/examples/epac2004_benchmarks/input_thermal.in index 75f158951..d6ba68b6d 100644 --- a/examples/epac2004_benchmarks/input_thermal.in +++ b/examples/epac2004_benchmarks/input_thermal.in @@ -23,8 +23,8 @@ monitor.backend = h5 constf1.type = constf constf1.ds = 10.0 constf1.kx = 6.283185307179586 -constf1.ky = 6.283185307179586 -constf1.kt = 6.283185307179586 +constf1.ky = constf1.kx +constf1.kt = constf1.kx constf1.nslice = 400 #full resolution #constf1.nslice = 50 diff --git a/examples/expanding_beam/input_expanding_fft.in b/examples/expanding_beam/input_expanding_fft.in index 92c6a1df0..9ba39c481 100644 --- a/examples/expanding_beam/input_expanding_fft.in +++ b/examples/expanding_beam/input_expanding_fft.in @@ -8,7 +8,7 @@ beam.charge = 1.0e-9 beam.particle = electron beam.distribution = kurth6d beam.lambdaX = 4.472135955e-4 -beam.lambdaY = 4.472135955e-4 +beam.lambdaY = beam.lambdaX beam.lambdaT = 9.12241869e-7 beam.lambdaPx = 0.0 beam.lambdaPy = 0.0 diff --git a/examples/expanding_beam/input_expanding_mlmg.in b/examples/expanding_beam/input_expanding_mlmg.in index c8ec50a44..a31c6ed97 100644 --- a/examples/expanding_beam/input_expanding_mlmg.in +++ b/examples/expanding_beam/input_expanding_mlmg.in @@ -8,7 +8,7 @@ beam.charge = 1.0e-9 beam.particle = electron beam.distribution = kurth6d beam.lambdaX = 4.472135955e-4 -beam.lambdaY = 4.472135955e-4 +beam.lambdaY = beam.lambdaX beam.lambdaT = 9.12241869e-7 beam.lambdaPx = 0.0 beam.lambdaPy = 0.0 diff --git a/examples/fodo/input_fodo.in b/examples/fodo/input_fodo.in index ab3db1124..bb9076374 100644 --- a/examples/fodo/input_fodo.in +++ b/examples/fodo/input_fodo.in @@ -8,13 +8,13 @@ beam.charge = 1.0e-9 beam.particle = electron beam.distribution = waterbag beam.lambdaX = 3.9984884770e-5 -beam.lambdaY = 3.9984884770e-5 +beam.lambdaY = beam.lambdaX beam.lambdaT = 1.0e-3 beam.lambdaPx = 2.6623538760e-5 -beam.lambdaPy = 2.6623538760e-5 +beam.lambdaPy = beam.lambdaPx beam.lambdaPt = 2.0e-3 beam.muxpx = -0.846574929020762 -beam.muypy = 0.846574929020762 +beam.muypy = -beam.muxpx beam.mutpt = 0.0 diff --git a/examples/fodo/input_fodo_twiss.in b/examples/fodo/input_fodo_twiss.in index 5e8fcd670..954dc6a5e 100644 --- a/examples/fodo/input_fodo_twiss.in +++ b/examples/fodo/input_fodo_twiss.in @@ -8,13 +8,13 @@ beam.charge = 1.0e-9 beam.particle = electron beam.distribution = waterbag_from_twiss beam.alphaX = -1.5905003499999992 -beam.alphaY = 1.5905003499999992 +beam.alphaY = -beam.alphaX beam.alphaT = 0.0 beam.betaX = 2.8216194100262637 -beam.betaY = 2.8216194100262637 +beam.betaY = beam.betaX beam.betaT = 0.5 beam.emittX = 2e-09 -beam.emittY = 2e-09 +beam.emittY = beam.emittX beam.emittT = 2e-06 diff --git a/examples/fodo_channel/input_fodo.in b/examples/fodo_channel/input_fodo.in index e782be7f8..51f06a275 100644 --- a/examples/fodo_channel/input_fodo.in +++ b/examples/fodo_channel/input_fodo.in @@ -8,13 +8,13 @@ beam.charge = 1.0e-9 beam.particle = electron beam.distribution = waterbag_from_twiss beam.alphaX = -1.5905003499999992 -beam.alphaY = 1.5905003499999992 +beam.alphaY = -beam.alphaX beam.alphaT = 0.0 beam.betaX = 2.8216194100262637 -beam.betaY = 2.8216194100262637 +beam.betaY = beam.betaX beam.betaT = 0.5 beam.emittX = 2e-09 -beam.emittY = 2e-09 +beam.emittY = beam.emittX beam.emittT = 2e-06 diff --git a/examples/fodo_chromatic/input_fodo_chr.in b/examples/fodo_chromatic/input_fodo_chr.in index 06fdda774..373a08e07 100644 --- a/examples/fodo_chromatic/input_fodo_chr.in +++ b/examples/fodo_chromatic/input_fodo_chr.in @@ -8,13 +8,13 @@ beam.charge = 1.0e-9 beam.particle = electron beam.distribution = waterbag beam.lambdaX = 3.9984884770e-5 -beam.lambdaY = 3.9984884770e-5 +beam.lambdaY = beam.lambdaX beam.lambdaT = 1.0e-3 beam.lambdaPx = 2.6623538760e-5 -beam.lambdaPy = 2.6623538760e-5 +beam.lambdaPy = beam.lambdaPx beam.lambdaPt = 2.0e-3 beam.muxpx = -0.846574929020762 -beam.muypy = 0.846574929020762 +beam.muypy = -beam.muxpx beam.mutpt = 0.0 diff --git a/examples/fodo_tune/input_fodo_tune.in b/examples/fodo_tune/input_fodo_tune.in index 2e17003ea..c35ce3c30 100644 --- a/examples/fodo_tune/input_fodo_tune.in +++ b/examples/fodo_tune/input_fodo_tune.in @@ -8,13 +8,13 @@ beam.charge = 1.0e-9 beam.particle = electron beam.distribution = waterbag beam.lambdaX = 3.9984884770e-5 -beam.lambdaY = 3.9984884770e-5 +beam.lambdaY = beam.lambdaX beam.lambdaT = 1.0e-3 beam.lambdaPx = 2.6623538760e-5 -beam.lambdaPy = 2.6623538760e-5 +beam.lambdaPy = beam.lambdaPx beam.lambdaPt = 2.0e-3 beam.muxpx = -0.846574929020762 -beam.muypy = 0.846574929020762 +beam.muypy = -beam.muxpx beam.mutpt = 0.0 diff --git a/examples/iota_lens/input_iotalens.in b/examples/iota_lens/input_iotalens.in index f4f5ea2b4..74a4304c6 100644 --- a/examples/iota_lens/input_iotalens.in +++ b/examples/iota_lens/input_iotalens.in @@ -8,10 +8,10 @@ beam.charge = 1.0e-9 beam.particle = proton beam.distribution = waterbag beam.lambdaX = 2.0e-3 -beam.lambdaY = 2.0e-3 +beam.lambdaY = beam.lambdaX beam.lambdaT = 1.0e-3 beam.lambdaPx = 3.0e-4 -beam.lambdaPy = 3.0e-4 +beam.lambdaPy = beam.lambdaPx beam.lambdaPt = 0.0 beam.muxpx = 0.0 beam.muypy = 0.0 diff --git a/examples/iota_lens/input_iotalens_sdep.in b/examples/iota_lens/input_iotalens_sdep.in index 1c9e214e5..7b160dbcb 100644 --- a/examples/iota_lens/input_iotalens_sdep.in +++ b/examples/iota_lens/input_iotalens_sdep.in @@ -8,7 +8,7 @@ beam.charge = 1.0e-9 beam.particle = proton beam.distribution = waterbag #beam.lambdaX = 2.0e-3 -#beam.lambdaY = 2.0e-3 +#beam.lambdaY = beam.lambdaX #beam.lambdaT = 1.0e-3 #beam.lambdaPx = 3.0e-4 #beam.lambdaPy = 3.0e-4 @@ -17,13 +17,13 @@ beam.distribution = waterbag #beam.muypy = 0.0 #beam.mutpt = 0.0 beam.lambdaX = 1.397456296195e-003 -beam.lambdaY = 1.397456296195e-003 +beam.lambdaY = beam.lambdaX beam.lambdaT = 1.0e-4 beam.lambdaPx = 1.256184325020e-003 -beam.lambdaPy = 1.256184325020e-003 +beam.lambdaPy = beam.lambdaPx beam.lambdaPt = 0.0 beam.muxpx = 0.8090169943749474 -beam.muypy = 0.8090169943749474 +beam.muypy = beam.muxpx beam.mutpt = 0.0 diff --git a/examples/kicker/input_kicker.in b/examples/kicker/input_kicker.in index dddf3787d..db2140ae8 100644 --- a/examples/kicker/input_kicker.in +++ b/examples/kicker/input_kicker.in @@ -8,10 +8,10 @@ beam.charge = 1.0e-9 beam.particle = electron beam.distribution = waterbag beam.lambdaX = 4.0e-3 -beam.lambdaY = 4.0e-3 +beam.lambdaY = beam.lambdaX beam.lambdaT = 1.0e-3 beam.lambdaPx = 3.0e-4 -beam.lambdaPy = 3.0e-4 +beam.lambdaPy = beam.lambdaPx beam.lambdaPt = 2.0e-3 beam.muxpx = 0.0 beam.muypy = 0.0 diff --git a/examples/kurth/input_kurth_10nC_periodic.in b/examples/kurth/input_kurth_10nC_periodic.in index 8e3f15bac..20360cea6 100644 --- a/examples/kurth/input_kurth_10nC_periodic.in +++ b/examples/kurth/input_kurth_10nC_periodic.in @@ -2,17 +2,17 @@ # Particle Beam(s) ############################################################################### beam.npart = 10000 -#beam.npart = 100000 #optional for increased precision +#beam.npart = 100000 # optional for increased precision beam.units = static beam.kin_energy = 2.0e3 beam.charge = 1.0e-8 beam.particle = proton beam.distribution = kurth6d beam.lambdaX = 1.46e-3 -beam.lambdaY = 1.46e-3 +beam.lambdaY = beam.lambdaX beam.lambdaT = 4.9197638312420749e-4 beam.lambdaPx = 6.84931506849e-4 -beam.lambdaPy = 6.84931506849e-4 +beam.lambdaPy = beam.lambdaPx beam.lambdaPt = 2.0326178944803812e-3 @@ -21,7 +21,7 @@ beam.lambdaPt = 2.0326178944803812e-3 ############################################################################### lattice.elements = monitor drift1 constf1 drift1 monitor lattice.nslice = 20 -#lattice.nslice = 30 #optional for increased precision +#lattice.nslice = 30 # optional for increased precision monitor.type = beam_monitor monitor.backend = h5 diff --git a/examples/kurth/input_kurth_periodic.in b/examples/kurth/input_kurth_periodic.in index 2af0f6a4f..e1f073eee 100644 --- a/examples/kurth/input_kurth_periodic.in +++ b/examples/kurth/input_kurth_periodic.in @@ -8,10 +8,10 @@ beam.charge = 1.0e-8 beam.particle = proton beam.distribution = kurth6d beam.lambdaX = 1.11e-3 -beam.lambdaY = 1.11e-3 +beam.lambdaY = beam.lambdaX beam.lambdaT = 3.74036839224568e-4 beam.lambdaPx = 9.00900900901e-4 -beam.lambdaPy = 9.00900900901e-4 +beam.lambdaPy = beam.lambdaPx beam.lambdaPt = 2.6735334467940146e-3 @@ -29,8 +29,8 @@ drift1.ds = 1.0 constf1.type = constf constf1.ds = 2.0 constf1.kx = 0.7 -constf1.ky = 0.7 -constf1.kt = 0.7 +constf1.ky = constf1.kx +constf1.kt = constf1.kx ############################################################################### diff --git a/examples/linac_segment/input_linac_segment.in b/examples/linac_segment/input_linac_segment.in index 920262c55..3a858ce53 100644 --- a/examples/linac_segment/input_linac_segment.in +++ b/examples/linac_segment/input_linac_segment.in @@ -6,7 +6,7 @@ beam.npart = 10000 beam.units = static beam.kin_energy = 2.1226695 -beam.charge = 2.9824923076852509e-11 #based on I/f +beam.charge = 2.9824923076852509e-11 # based on I/f beam.particle = Hminus beam.distribution = gaussian_from_twiss beam.alphaX = 0.13233244124654187 diff --git a/examples/multipole/input_multipole.in b/examples/multipole/input_multipole.in index 93e452d4e..63eb5641d 100644 --- a/examples/multipole/input_multipole.in +++ b/examples/multipole/input_multipole.in @@ -8,10 +8,10 @@ beam.charge = 1.0e-9 beam.particle = electron beam.distribution = waterbag beam.lambdaX = 4.0e-3 -beam.lambdaY = 4.0e-3 +beam.lambdaY = beam.lambdaX beam.lambdaT = 1.0e-3 beam.lambdaPx = 3.0e-4 -beam.lambdaPy = 3.0e-4 +beam.lambdaPy = beam.lambdaPx beam.lambdaPt = 2.0e-3 beam.muxpx = 0.0 beam.muypy = 0.0 @@ -27,17 +27,17 @@ monitor.type = beam_monitor monitor.backend = h5 thin_quadrupole.type = multipole -thin_quadrupole.multipole = 2 //Thin quadrupole +thin_quadrupole.multipole = 2 # Thin quadrupole thin_quadrupole.k_normal = 3.0 thin_quadrupole.k_skew = 0.0 thin_sextupole.type = multipole -thin_sextupole.multipole = 3 //Thin sextupole +thin_sextupole.multipole = 3 # Thin sextupole thin_sextupole.k_normal = 100.0 thin_sextupole.k_skew = -50.0 thin_octupole.type = multipole -thin_octupole.multipole = 4 //Thin octupole +thin_octupole.multipole = 4 # Thin octupole thin_octupole.k_normal = 65.0 thin_octupole.k_skew = 6.0 diff --git a/examples/positron_channel/input_positron.in b/examples/positron_channel/input_positron.in index c552ca0c7..ba7b52703 100644 --- a/examples/positron_channel/input_positron.in +++ b/examples/positron_channel/input_positron.in @@ -8,10 +8,10 @@ beam.charge = 190.0e-12 beam.particle = positron beam.distribution = triangle beam.lambdaX = 5.054566450e-6 -beam.lambdaY = 5.054566450e-6 +beam.lambdaY = beam.lambdaX beam.lambdaT = 8.43732950e-7 beam.lambdaPx = 1.01091329e-7 -beam.lambdaPy = 1.01091329e-7 +beam.lambdaPy = beam.lambdaPx beam.lambdaPt = 1.0e-2 beam.muxpx = 0.0 beam.muypy = 0.0 diff --git a/examples/quadrupole_softedge/input_quadrupole_softedge.in b/examples/quadrupole_softedge/input_quadrupole_softedge.in index b3fc60891..017857aa6 100644 --- a/examples/quadrupole_softedge/input_quadrupole_softedge.in +++ b/examples/quadrupole_softedge/input_quadrupole_softedge.in @@ -8,13 +8,13 @@ beam.charge = 1.0e-9 beam.particle = electron beam.distribution = waterbag beam.lambdaX = 3.9984884770e-5 -beam.lambdaY = 3.9984884770e-5 +beam.lambdaY = beam.lambdaX beam.lambdaT = 1.0e-3 beam.lambdaPx = 2.6623538760e-5 -beam.lambdaPy = 2.6623538760e-5 +beam.lambdaPy = beam.lambdaPx beam.lambdaPt = 2.0e-3 beam.muxpx = -0.846574929020762 -beam.muypy = 0.846574929020762 +beam.muypy = -beam.muxpx beam.mutpt = 0.0 diff --git a/examples/rotation/input_rotation.in b/examples/rotation/input_rotation.in index b8a786b2f..ec5e01cc1 100644 --- a/examples/rotation/input_rotation.in +++ b/examples/rotation/input_rotation.in @@ -8,10 +8,10 @@ beam.charge = 1.0e-9 beam.particle = electron beam.distribution = waterbag beam.lambdaX = 4.0e-3 -beam.lambdaY = 4.0e-3 +beam.lambdaY = beam.lambdaX beam.lambdaT = 1.0e-3 beam.lambdaPx = 3.0e-4 -beam.lambdaPy = 3.0e-4 +beam.lambdaPy = beam.lambdaPx beam.lambdaPt = 2.0e-3 diff --git a/examples/thin_dipole/input_thin_dipole.in b/examples/thin_dipole/input_thin_dipole.in index e78934484..7d393085e 100644 --- a/examples/thin_dipole/input_thin_dipole.in +++ b/examples/thin_dipole/input_thin_dipole.in @@ -8,11 +8,11 @@ beam.charge = 1.0e-9 beam.particle = proton beam.distribution = waterbag beam.lambdaX = 1.0e-3 -beam.lambdaY = 1.0e-3 +beam.lambdaY = beam.lambdaX beam.lambdaT = 0.3 beam.lambdaPx = 2.0e-4 -beam.lambdaPy = 2.0e-4 -beam.lambdaPt = 2.0e-4 +beam.lambdaPy = beam.lambdaPx +beam.lambdaPt = beam.lambdaPx beam.muxpx = 0.0 beam.muypy = 0.0 beam.mutpt = 0.0