Merge branch 'develop'

Author: giadarol

Simulation.py

@@ -14,6 +14,7 @@
 class Simulation(object):
     def __init__(self):
         self.N_turns = pp.N_turns
+        self.pp = pp
 
     def init_all(self):
 
@@ -315,23 +316,31 @@ def init_master(self):
                 n_macroparticles=pp.n_macroparticles_for_footprint_track, intensity=pp.intensity, 
                 epsn_x=pp.epsn_x, epsn_y=pp.epsn_y, sigma_z=pp.sigma_z)
         elif SimSt.first_run:
-            self.bunch = self.machine.generate_6D_Gaussian_bunch_matched(
-                            n_macroparticles=pp.n_macroparticles, intensity=pp.intensity, 
-                            epsn_x=pp.epsn_x, epsn_y=pp.epsn_y, sigma_z=pp.sigma_z)
-            
-            # compute initial displacements
-            inj_opt = self.machine.transverse_map.get_injection_optics()
-            sigma_x = np.sqrt(inj_opt['beta_x']*pp.epsn_x/self.machine.betagamma)
-            sigma_y = np.sqrt(inj_opt['beta_y']*pp.epsn_y/self.machine.betagamma)
-            x_kick = pp.x_kick_in_sigmas*sigma_x
-            y_kick = pp.y_kick_in_sigmas*sigma_y
-            
-            # apply initial displacement
-            if not pp.footprint_mode:
-                self.bunch.x += x_kick
-                self.bunch.y += y_kick
-            
-            print 'Bunch initialized.'
+
+            if pp.bunch_from_file is not None:
+                print 'Loading bunch from file %s ...'%pp.bunch_from_file
+                with h5py.File(pp.bunch_from_file, 'r') as fid:
+                    self.bunch = self.buffer_to_piece(np.array(fid['bunch']).copy())
+                print 'Bunch loaded from file.\n'
+
+            else:
+                self.bunch = self.machine.generate_6D_Gaussian_bunch_matched(
+                                n_macroparticles=pp.n_macroparticles, intensity=pp.intensity, 
+                                epsn_x=pp.epsn_x, epsn_y=pp.epsn_y, sigma_z=pp.sigma_z)
+                
+                # compute initial displacements
+                inj_opt = self.machine.transverse_map.get_injection_optics()
+                sigma_x = np.sqrt(inj_opt['beta_x']*pp.epsn_x/self.machine.betagamma)
+                sigma_y = np.sqrt(inj_opt['beta_y']*pp.epsn_y/self.machine.betagamma)
+                x_kick = pp.x_kick_in_sigmas*sigma_x
+                y_kick = pp.y_kick_in_sigmas*sigma_y
+                
+                # apply initial displacement
+                if not pp.footprint_mode:
+                    self.bunch.x += x_kick
+                    self.bunch.y += y_kick
+                
+                print 'Bunch initialized.'
         else:
             print 'Loading bunch from file...'
             with h5py.File('bunch_status_part%02d.h5'%(SimSt.present_simulation_part-1), 'r') as fid:
@@ -482,15 +491,19 @@ def Get_rank(self):
     def Barrier(self):
         pass
 
-def get_sim_instance(N_cores_pretend, id_pretend):
+def get_sim_instance(N_cores_pretend, id_pretend, 
+        init_sim_objects_auto=True):
+
     from PyPARIS.ring_of_CPUs import RingOfCPUs
     myCPUring = RingOfCPUs(Simulation(),
-            comm=DummyComm(N_cores_pretend, id_pretend))
+            comm=DummyComm(N_cores_pretend, id_pretend), 
+                init_sim_objects_auto=init_sim_objects_auto)
     return myCPUring.sim_content
 
-def get_serial_CPUring():
+def get_serial_CPUring(init_sim_objects_auto=True):
     from PyPARIS.ring_of_CPUs import RingOfCPUs
-    myCPUring = RingOfCPUs(Simulation(), force_serial=True)
+    myCPUring = RingOfCPUs(Simulation(), force_serial=True, 
+                init_sim_objects_auto=init_sim_objects_auto)
     return myCPUring
 
 

Simulation_parameters.py.example

@@ -41,6 +41,8 @@ if enable_transverse_damper: n_non_parallelizable += 1
 # Beam Parameters #
 ###################
 
+bunch_from_file = None
+
 intensity = 1.2e+11
 
 epsn_x = 2.5e-6

__version__.py

@@ -1 +1 @@
-__version__ = '1.1.0'
+__version__ = '1.2.0'

examples/feedback_damping_time/000_run_serial.sh renamed to examples/000_feedback_damping_time/000_run_serial.sh

@@ -41,6 +41,8 @@
 # Beam Parameters #
 ###################
 
+bunch_from_file = None
+
 intensity = 1.2e+11
 
 epsn_x = 2.5e-6