Merge pull request #2 from aoeftiger/pr37and50

Pr37and50
SixTrack · Aug 24, 2020 · 830b1fc · 830b1fc
2 parents da92ecd + 33f9c35
commit 830b1fc
Show file tree

Hide file tree

Showing 16 changed files with 153 additions and 4,907 deletions.
diff --git a/examples/bbsimple/testbb6d.py b/examples/bbsimple/testbb6d.py
@@ -14,10 +14,10 @@
 p0c_eV = sixinput.initialconditions[-3] * 1e6
 
 # Build pysixtrack line from sixtrack input
-line, other_data = pysixtrack.Line.from_sixinput(sixinput)
+line = pysixtrack.Line.from_sixinput(sixinput)
 
 # Info on sixtrack->pyblep conversion
-iconv = line.other_data["iconv"]
+iconv = line.other_info["iconv"]
 
 ########################################################
 #                  Search closed orbit                 #

diff --git a/examples/beambeam/testbb6d.py b/examples/beambeam/testbb6d.py
@@ -17,7 +17,7 @@
 line = pysixtrack.Line.from_sixinput(sixinput)
 
 # Info on sixtrack->pyblep conversion
-iconv = line.other_data["iconv"]
+iconv = line.other_info["iconv"]
 
 ########################################################
 #                  Search closed orbit                 #

diff --git a/examples/fodo/benchmark.py b/examples/fodo/benchmark.py
@@ -3,7 +3,7 @@
 
 six = sixtracktools.SixInput(".")
 line = pysixtrack.Line.from_sixinput(six)
-iconv = line.other_data["iconv"]
+iconv = line.other_info["iconv"]
 
 sixdump = sixtracktools.SixDump101("res/dump.dat")[1::2]
 

diff --git a/examples/load_from_mad/001_line_with_bb_from_madx.py b/examples/load_from_mad/001_line_with_bb_from_madx.py
@@ -6,7 +6,9 @@
 import pysixtrack
 
 from pysixtrack.be_beamfields.tools import get_bb_names_madpoints_sigmas
-from pysixtrack.be_beamfields.tools import shift_strong_beam_based_on_close_ip
+from pysixtrack.be_beamfields.tools import (
+    compute_shift_strong_beam_based_on_close_ip,
+)
 from pysixtrack.be_beamfields.tools import setup_beam_beam_in_line
 from pysixtrack import MadPoint
 
@@ -68,7 +70,7 @@
 )
 
 # Correct for small shifts between surveys of the two beams
-shift_strong_beam_based_on_close_ip(
+strong_shifts = compute_shift_strong_beam_based_on_close_ip(
     points_weak=bb_xyz_b1,
     points_strong=bb_xyz_b2,
     IPs_survey_weak=IP_xyz_b1,
@@ -96,6 +98,7 @@
     bb_sigmas_strong=bb_sigmas_b2,
     bb_points_weak=bb_xyz_b1,
     bb_points_strong=bb_xyz_b2,
+    bb_shift_strong=strong_shifts,
     beta_r_strong=beta_r,
     bunch_intensity_strong=bunch_intensity,
     n_slices_6D=n_slices,

diff --git a/examples/load_from_sixtrack_input/000_basics.py b/examples/load_from_sixtrack_input/000_basics.py
diff --git a/examples/load_from_sixtrack_input/sixtrack_input/.gitignore b/examples/load_from_sixtrack_input/sixtrack_input/.gitignore
diff --git a/examples/load_from_sixtrack_input/sixtrack_input/fort.16 b/examples/load_from_sixtrack_input/sixtrack_input/fort.16
diff --git a/examples/load_from_sixtrack_input/sixtrack_input/fort.2 b/examples/load_from_sixtrack_input/sixtrack_input/fort.2
diff --git a/examples/load_from_sixtrack_input/sixtrack_input/fort.3 b/examples/load_from_sixtrack_input/sixtrack_input/fort.3
diff --git a/examples/load_from_sixtrack_input/sixtrack_input/fort.8 b/examples/load_from_sixtrack_input/sixtrack_input/fort.8
diff --git a/pysixtrack/be_beamfields/spacecharge.py b/pysixtrack/be_beamfields/spacecharge.py
@@ -15,7 +15,7 @@ class SpaceChargeCoasting(Element):
         ("y_co", "m", "Vertical closed orbit offset", 0.0),
     ]
     _extra = [
-        ("min_sigma_diff", "m", "Threshold to detect round beam", 1e-10),
+        ("min_sigma_diff", "m", "Threshold to detect round beam", 1e-8),
         ("enabled", "", "Switch to disable space charge effect", True),
     ]
 
@@ -79,7 +79,7 @@ class SpaceChargeQGaussianProfile(Element):
         ("y_co", "m", "Vertical closed orbit offset", 0.0),
     ]
     _extra = [
-        ("min_sigma_diff", "m", "Threshold to detect round beam", 1e-10),
+        ("min_sigma_diff", "m", "Threshold to detect round beam", 1e-8),
         ("enabled", "", "Switch to disable space charge effect", True),
         ("q_parameter", "", "q parameter of generalised Gaussian distribution (q=1 for standard Gaussian)", 1.0),
         ("b_parameter", "", "b parameter of generalised Gaussian distribution (b=1 for standard Gaussian)", 1.0),
@@ -158,7 +158,7 @@ class SpaceChargeInterpolatedProfile(Element):
         ("y_co", "m", "Vertical closed orbit offset", 0.0),
     ]
     _extra = [
-        ("min_sigma_diff", "m", "Threshold to detect round beam", 1e-10),
+        ("min_sigma_diff", "m", "Threshold to detect round beam", 1e-8),
         ("enabled", "", "Switch to disable space charge effect", True),
     ]