Merge branch 'develop'

PyCOMPLETE · Apr 5, 2016 · e686032 · e686032
2 parents a29cfe4 + d917ffe
commit e686032
Show file tree

Hide file tree

Showing 32 changed files with 167 additions and 37 deletions.
diff --git a/MP_system.py b/MP_system.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                                          
-#                   PyECLOUD Version 5.0.2                     
+#                   PyECLOUD Version 5.1.0                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/PyEC4PyHT.py b/PyEC4PyHT.py
@@ -8,7 +8,7 @@
 #     
 #     This file is part of the code:
 #                                                                                          
-#                   PyECLOUD Version 5.0.2                     
+#                   PyECLOUD Version 5.1.0                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 
@@ -83,16 +83,19 @@ class MP_light(object):
 
 class Ecloud(object):
 	def __init__(self, L_ecloud, slicer, Dt_ref, pyecl_input_folder='./', flag_clean_slices = False,
-				slice_by_slice_mode=False, **kwargs):
+				slice_by_slice_mode=False, space_charge_obj=None, **kwargs):
 
 
-		print 'PyECLOUD Version 5.0.2'
+		print 'PyECLOUD Version 5.1.0'
 		print 'PyHEADTAIL module'
 		print 'Initializing ecloud from folder: '+pyecl_input_folder
 		self.slicer = slicer
 		self.Dt_ref = Dt_ref
 		self.L_ecloud = L_ecloud	
 
+		self.pyecl_input_folder = pyecl_input_folder
+		self.kwargs = kwargs
+
 		b_par, x_aper, y_aper, B,\
 		gas_ion_flag, P_nTorr, sigma_ion_MBarn, Temp_K, unif_frac, E_init_ion,\
 		Emax, del_max, R0, E_th, sigmafit, mufit,\
@@ -158,7 +161,10 @@ def __init__(self, L_ecloud, slicer, Dt_ref, pyecl_input_folder='./', flag_clean
 			print '''sparse_solver: 'klu' no longer supported --> going to PyKLU'''
 			sparse_solver='PyKLU'
 
-		spacech_ele = scc.space_charge(chamb, Dh_sc, Dt_sc=Dt_sc, sparse_solver=sparse_solver, PyPICmode=PyPICmode)
+		if space_charge_obj is not None:
+			spacech_ele = space_charge_obj
+		else:
+			spacech_ele = scc.space_charge(chamb, Dh_sc, Dt_sc=Dt_sc, sparse_solver=sparse_solver, PyPICmode=PyPICmode)
 
 
 		if switch_model==0 or switch_model=='ECLOUD':
@@ -191,7 +197,7 @@ def __init__(self, L_ecloud, slicer, Dt_ref, pyecl_input_folder='./', flag_clean
 			import dynamics_Boris_multipole as dynmul
 			dynamics=dynmul.pusher_Boris_multipole(Dt=Dt, N_sub_steps=N_sub_steps, B_multip = B_multip)   
 		else:
-			raise ValueError("""track_method should be 'Boris' or 'BorisMultipole' - others are not implemented in the PyHEADTAIL module""")
+			raise ValueError("""track_method should be 'Boris' or 'BorisMultipole' - others are not implemented in the PyEC4PyHT module""")
 
 
 		if init_unif_flag==1:
@@ -497,6 +503,12 @@ def _track_in_single_slice_mode(self, beam):
 		if beam.slice_info is not 'unsliced':
 			dz = beam.slice_info['z_bin_right']-beam.slice_info['z_bin_left']	
 			self._track_single_slice(beam, ix=np.arange(beam.macroparticlenumber), dz=dz)
+
+	def generate_twin_ecloud_with_shared_space_charge(self):
+		if hasattr(self, 'efieldmap'):
+			raise ValueError('Ecloud has been replaced with field map. I cannot generate a twin ecloud!')
+		return Ecloud(self.L_ecloud, self.slicer, self.Dt_ref, self.pyecl_input_folder, self.flag_clean_slices,
+				self.slice_by_slice_mode, space_charge_obj=self.spacech_ele, **self.kwargs)
 
 
 

diff --git a/beam_and_timing.py b/beam_and_timing.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                                          
-#                   PyECLOUD Version 5.0.2                     
+#                   PyECLOUD Version 5.1.0                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/buildup_simulation.py b/buildup_simulation.py
@@ -9,7 +9,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.2                   
+#		           PyECLOUD Version 5.1.0                   
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 
@@ -59,7 +59,7 @@
 class BuildupSimulation(object):
 	def __init__(self, pyecl_input_folder='./', **kwargs):
 
-		print 'PyECLOUD Version 5.0.2'
+		print 'PyECLOUD Version 5.1.0'
 		beamtim,MP_e, dynamics,impact_man, pyeclsaver, \
 				gas_ion_flag, resgasion, t_ion, \
 				spacech_ele,t_sc_ON, photoem_flag, phemiss,\

diff --git a/change_version_number.py b/change_version_number.py
@@ -9,7 +9,7 @@
         with open(filename) as fid:
             content=fid.read()
         if '[email protected]' in content:
-            content=content.replace('PyECLOUD Version 5.0.2', 'PyECLOUD Version 5.0.2')
+            content=content.replace('PyECLOUD Version 5.1.0', 'PyECLOUD Version 5.1.0')
             with open(filename,'w') as fid:
                 fid.write(content)
 

diff --git a/dynamics_Boris_f2py.py b/dynamics_Boris_f2py.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.2                     
+#		           PyECLOUD Version 5.1.0                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/dynamics_Boris_multipole.py b/dynamics_Boris_multipole.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                                           
-#                          PyECLOUD Version 5.0.2                   
+#                          PyECLOUD Version 5.1.0                   
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/dynamics_dipole.py b/dynamics_dipole.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.2                     
+#		           PyECLOUD Version 5.1.0                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/dynamics_strong_B_generalized.py b/dynamics_strong_B_generalized.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.2                     
+#		           PyECLOUD Version 5.1.0                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/gas_ionization_class.py b/gas_ionization_class.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.2                     
+#		           PyECLOUD Version 5.1.0                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/gen_photoemission_class.py b/gen_photoemission_class.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.2                   
+#		           PyECLOUD Version 5.1.0                   
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/geom_impact_ellip.py b/geom_impact_ellip.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.2               
+#		           PyECLOUD Version 5.1.0               
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/geom_impact_poly.py b/geom_impact_poly.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                                          
-#                   PyECLOUD Version 5.0.2                   
+#                   PyECLOUD Version 5.1.0                   
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/geom_impact_poly_fast_impact.py b/geom_impact_poly_fast_impact.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                                          
-#                   PyECLOUD Version 5.0.2                   
+#                   PyECLOUD Version 5.1.0                   
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/geom_impact_rect_fast_impact.py b/geom_impact_rect_fast_impact.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                                          
-#                   PyECLOUD Version 5.0.2                   
+#                   PyECLOUD Version 5.1.0                   
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/impact_management_class.py b/impact_management_class.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.2                     
+#		           PyECLOUD Version 5.1.0                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/init.py b/init.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.2                      
+#		           PyECLOUD Version 5.1.0                      
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/main.py b/main.py
@@ -9,7 +9,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.2                   
+#		           PyECLOUD Version 5.1.0                   
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/proc_video3.py b/proc_video3.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.2                  
+#		           PyECLOUD Version 5.1.0                  
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/pyecloud_saver.py b/pyecloud_saver.py
@@ -8,7 +8,7 @@
 #     
 #     This file is part of the code:
 #                                                                                          
-#                   PyECLOUD Version 5.0.2                     
+#                   PyECLOUD Version 5.1.0                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 
@@ -68,7 +68,7 @@ def __init__(self, logfile_path):
 		self.logfile_path = logfile_path
 		print 'Starting pyecloud_saver init.'
 		flog=open(self.logfile_path,'w')
-		flog.write('PyECLOUD Version 5.0.2\n')
+		flog.write('PyECLOUD Version 5.1.0\n')
 		timestr = time.strftime("%d %b %Y %H:%M:%S", time.localtime())
 		flog.write('Simulation started on %s\n'%timestr)
 		flog.close()

diff --git a/sec_emission.py b/sec_emission.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.2                     
+#		           PyECLOUD Version 5.1.0                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/sec_emission_model_ECLOUD.py b/sec_emission_model_ECLOUD.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.2                     
+#		           PyECLOUD Version 5.1.0                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/sec_emission_model_ECLOUD_nunif.py b/sec_emission_model_ECLOUD_nunif.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.2                     
+#		           PyECLOUD Version 5.1.0                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/sec_emission_model_accurate_low_ene.py b/sec_emission_model_accurate_low_ene.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.2                     
+#		           PyECLOUD Version 5.1.0                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/sec_emission_model_cos_low_ener.py b/sec_emission_model_cos_low_ener.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.2                     
+#		           PyECLOUD Version 5.1.0                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/sec_emission_model_flat_low_ener.py b/sec_emission_model_flat_low_ener.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.2                     
+#		           PyECLOUD Version 5.1.0                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/sincc_cosincc_cubsincc.py b/sincc_cosincc_cubsincc.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                      		            
-#		           PyECLOUD Version 5.0.2                      
+#		           PyECLOUD Version 5.1.0                      
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/space_charge_class.py b/space_charge_class.py
@@ -8,7 +8,7 @@
 #     This file is part of the code:
 #                                                                      		    
 # 
-#		           PyECLOUD Version 5.0.2                     
+#		           PyECLOUD Version 5.1.0                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/space_charge_class_SW_old.py b/space_charge_class_SW_old.py
@@ -8,7 +8,7 @@
 #     This file is part of the code:
 #                                                                      		    
 # 
-#		           PyECLOUD Version 5.0.2                     
+#		           PyECLOUD Version 5.1.0                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/test_StrongB_generalized.py b/test_StrongB_generalized.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                                          
-#                   PyECLOUD Version 5.0.2                     
+#                   PyECLOUD Version 5.1.0                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA 

diff --git a/test_StrongB_generalized_2.py b/test_StrongB_generalized_2.py
@@ -7,7 +7,7 @@
 #     
 #     This file is part of the code:
 #                                                                                          
-#                   PyECLOUD Version 5.0.2                     
+#                   PyECLOUD Version 5.1.0                     
 #                  
 #                                                                       
 #     Author and contact:   Giovanni IADAROLA