Use twin clouds

giadarol · Apr 5, 2016 · 6c6df92 · 6c6df92
1 parent 60f583e
commit 6c6df92
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/test_physics/000_test_with_ecloud.py b/test_physics/000_test_with_ecloud.py
@@ -8,6 +8,6 @@
 from Simulation_with_eclouds import Simulation
 simulation_content = Simulation()
 
-myCPUring = RingOfCPUs(simulation_content, N_pieces_per_transfer=5)
+myCPUring = RingOfCPUs(simulation_content, N_pieces_per_transfer=10)
 
 myCPUring.run()
diff --git a/test_physics/Simulation_with_eclouds.py b/test_physics/Simulation_with_eclouds.py
@@ -64,12 +64,7 @@ def init_all(self):
 		nel_mp_ref_0 = init_unif_edens*4*x_aper*y_aper/N_MP_ele_init
 
 		import PyECLOUD.PyEC4PyHT as PyEC4PyHT
-		my_new_part = []
-		self.my_list_eclouds = []
-		for ele in self.mypart:
-			my_new_part.append(ele)
-			if ele in self.machine.transverse_map:
-				ecloud_new = PyEC4PyHT.Ecloud(slice_by_slice_mode=True,
+		ecloud = PyEC4PyHT.Ecloud(slice_by_slice_mode=True,
 						L_ecloud=self.machine.circumference/n_segments, 
 						slicer=None, 
 						Dt_ref=25e-12, 
@@ -81,6 +76,14 @@ def init_all(self):
 						N_mp_max=N_mp_max,
 						nel_mp_ref_0=nel_mp_ref_0,
 						B_multip=B_multip)
+
+
+		my_new_part = []
+		self.my_list_eclouds = []
+		for ele in self.mypart:
+			my_new_part.append(ele)
+			if ele in self.machine.transverse_map:
+				ecloud_new = ecloud.generate_twin_ecloud_with_shared_space_charge()
 				my_new_part.append(ecloud_new)
 				self.my_list_eclouds.append(ecloud_new)
 		self.mypart = my_new_part

diff --git a/test_ring_with_objects/Simulation_with_eclouds.py b/test_ring_with_objects/Simulation_with_eclouds.py
@@ -53,14 +53,9 @@ def init_all(self):
 		N_mp_max = N_MP_ele_init*4.
 		Dh_sc = .2e-3
 		nel_mp_ref_0 = init_unif_edens*4*x_aper*y_aper/N_MP_ele_init
-
+		
 		import PyECLOUD.PyEC4PyHT as PyEC4PyHT
-		my_new_part = []
-		self.my_list_eclouds = []
-		for ele in self.mypart:
-			my_new_part.append(ele)
-			if ele in self.machine.transverse_map:
-				ecloud_new = PyEC4PyHT.Ecloud(L_ecloud=self.machine.circumference/n_segments, slicer=None, 
+		ecloud = PyEC4PyHT.Ecloud(L_ecloud=self.machine.circumference/n_segments, slicer=None, 
 					Dt_ref=10e-12, pyecl_input_folder='../pyecloud_config',
 					chamb_type = chamb_type,
 					x_aper=x_aper, y_aper=y_aper,
@@ -71,6 +66,13 @@ def init_all(self):
 					nel_mp_ref_0=nel_mp_ref_0,
 					B_multip=B_multip_per_eV*self.machine.p0/e*c,
 					slice_by_slice_mode=True)
+
+		my_new_part = []
+		self.my_list_eclouds = []
+		for ele in self.mypart:
+			my_new_part.append(ele)
+			if ele in self.machine.transverse_map:
+				ecloud_new = ecloud.generate_twin_ecloud_with_shared_space_charge()
 				my_new_part.append(ecloud_new)
 				self.my_list_eclouds.append(ecloud_new)
 		self.mypart = my_new_part