BLonD v1.10.4. See README.md for details.

blond-admin · Apr 7, 2015 · b2de44e · b2de44e
1 parent 03ebf44
commit b2de44e
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 94 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,3 @@
 #######################
 /__doc/build/
 
-# Figure folder #
-#################
-/__EXAMPLE_MAIN_FILES/output_files/
diff --git a/README.md b/README.md
@@ -64,6 +64,9 @@ STRUCTURE
 
 VERSION CONTENTS
 ================
+2015-4-07
+v1.10.4 - Fixed two bugs in the EXAMPLE_MAIN_FILES
+
 2015-1-15
 v1.10.3 - Fixed two bugs in potential_well-cut and beam_profile_derivative routines
 

diff --git a/__EXAMPLE_MAIN_FILES/input_files/TC7_momentum.dat b/__EXAMPLE_MAIN_FILES/input_files/TC7_momentum.dat
diff --git a/__EXAMPLE_MAIN_FILES/input_files/TC7_voltage_1.dat b/__EXAMPLE_MAIN_FILES/input_files/TC7_voltage_1.dat
diff --git a/__EXAMPLE_MAIN_FILES/output_files/dummy.py b/__EXAMPLE_MAIN_FILES/output_files/dummy.py
@@ -0,0 +1 @@
+import numpy as np
diff --git a/__EXAMPLE_MAIN_FILES/test_cases/TC2_Main_long_ps_booster.py b/__EXAMPLE_MAIN_FILES/test_cases/TC2_Main_long_ps_booster.py
@@ -130,12 +130,12 @@
     pass
 
 # steps
-steps = InductiveImpedance(slice_beam, 34.6669349520904 / 10e9 * general_params.f_rev[0], 2e5) 
+steps = InductiveImpedance(slice_beam, 34.6669349520904 / 10e9 * general_params.f_rev[0], 2e5, RF_sct_par.counter) 
 
 # direct space charge
 dir_space_charge = InductiveImpedance(slice_beam, -376.730313462   
                      / (general_params.beta_r[0,0] *
-                     general_params.gamma_r[0,0]**2), 2e5)
+                     general_params.gamma_r[0,0]**2), 2e5, RF_sct_par.counter)
 
 
 # INDUCED VOLTAGE FROM IMPEDANCE------------------------------------------------

diff --git a/__EXAMPLE_MAIN_FILES/test_cases/TC7_Preprocess_data.py b/__EXAMPLE_MAIN_FILES/test_cases/TC7_Preprocess_data.py