Introduced customization.bash

lhcopt · Jun 19, 2020 · 86ef3db · 86ef3db
1 parent 77242af
commit 86ef3db
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 25 deletions.
diff --git a/examples/hl_lhc_collision/main.mask b/examples/hl_lhc_collision/main.mask
@@ -6,8 +6,7 @@
 system, "ln -fns /afs/cern.ch/eng/tracking-tools tracking_tools";
 
 ! Mask code folder
-!system, "ln -fns tracking_tools/modules modules";
-system, "ln -fns /home/giadarol/Desktop/20191212_pymask/lhcmask modules";
+system, "ln -fns tracking_tools/modules modules";
 
 ! Machine folder
 system, "ln -fns tracking_tools/machines machines"; 
@@ -22,6 +21,10 @@ system, "ln -fns tracking_tools/beambeam_macros beambeam_macros";
 system, "ln -fns tracking_tools/errors errors";  
 
 
+! Execute user-defined customization script if present
+system, "bash customization.bash"
+
+
 !*************************!
 !  General configuration  !
 !*************************!

diff --git a/examples/hl_lhc_collision/reference/main.mask b/examples/hl_lhc_collision/reference/main.mask
@@ -6,8 +6,7 @@
 system, "ln -fns /afs/cern.ch/eng/tracking-tools tracking_tools";
 
 ! Mask code folder
-!system, "ln -fns tracking_tools/modules modules";
-system, "ln -fns /home/giadarol/Desktop/20191212_pymask/lhcmask modules";
+system, "ln -fns tracking_tools/modules modules";
 
 ! Machine folder
 system, "ln -fns tracking_tools/machines machines"; 
@@ -22,6 +21,10 @@ system, "ln -fns tracking_tools/beambeam_macros beambeam_macros";
 system, "ln -fns tracking_tools/errors errors";  
 
 
+! Execute user-defined customization script if present
+system, "bash customization.bash"
+
+
 !*************************!
 !  General configuration  !
 !*************************!

diff --git a/examples/hl_lhc_collision_nobb_b4/main.mask b/examples/hl_lhc_collision_nobb_b4/main.mask
@@ -6,8 +6,7 @@
 system, "ln -fns /afs/cern.ch/eng/tracking-tools tracking_tools";
 
 ! Mask code folder
-!system, "ln -fns tracking_tools/modules modules";
-system, "ln -fns /home/giadarol/Desktop/20191212_pymask/lhcmask modules";
+system, "ln -fns tracking_tools/modules modules";
 
 ! Machine folder
 system, "ln -fns tracking_tools/machines machines"; 
@@ -22,6 +21,10 @@ system, "ln -fns tracking_tools/beambeam_macros beambeam_macros";
 system, "ln -fns tracking_tools/errors errors";  
 
 
+! Execute user-defined customization script if present
+system, "bash customization.bash"
+
+
 !*************************!
 !  General configuration  !
 !*************************!

diff --git a/examples/hl_lhc_collision_nobb_b4/reference/main.mask b/examples/hl_lhc_collision_nobb_b4/reference/main.mask
@@ -6,8 +6,7 @@
 system, "ln -fns /afs/cern.ch/eng/tracking-tools tracking_tools";
 
 ! Mask code folder
-!system, "ln -fns tracking_tools/modules modules";
-system, "ln -fns /home/giadarol/Desktop/20191212_pymask/lhcmask modules";
+system, "ln -fns tracking_tools/modules modules";
 
 ! Machine folder
 system, "ln -fns tracking_tools/machines machines"; 
@@ -22,6 +21,10 @@ system, "ln -fns tracking_tools/beambeam_macros beambeam_macros";
 system, "ln -fns tracking_tools/errors errors";  
 
 
+! Execute user-defined customization script if present
+system, "bash customization.bash"
+
+
 !*************************!
 !  General configuration  !
 !*************************!

diff --git a/examples/hl_lhc_injection/main.mask b/examples/hl_lhc_injection/main.mask
@@ -6,8 +6,7 @@
 system, "ln -fns /afs/cern.ch/eng/tracking-tools tracking_tools";
 
 ! Mask code folder
-!system, "ln -fns tracking_tools/modules modules";
-system, "ln -fns /home/giadarol/Desktop/20191212_pymask/lhcmask modules";
+system, "ln -fns tracking_tools/modules modules";
 
 ! Machine folder
 system, "ln -fns tracking_tools/machines machines"; 
@@ -22,6 +21,10 @@ system, "ln -fns tracking_tools/beambeam_macros beambeam_macros";
 system, "ln -fns tracking_tools/errors errors";  
 
 
+! Execute user-defined customization script if present
+system, "bash customization.bash"
+
+
 !*************************!
 !  General configuration  !
 !*************************!

diff --git a/examples/hl_lhc_injection/reference/main.mask b/examples/hl_lhc_injection/reference/main.mask
@@ -6,8 +6,7 @@
 system, "ln -fns /afs/cern.ch/eng/tracking-tools tracking_tools";
 
 ! Mask code folder
-!system, "ln -fns tracking_tools/modules modules";
-system, "ln -fns /home/giadarol/Desktop/20191212_pymask/lhcmask modules";
+system, "ln -fns tracking_tools/modules modules";
 
 ! Machine folder
 system, "ln -fns tracking_tools/machines machines"; 
@@ -22,6 +21,10 @@ system, "ln -fns tracking_tools/beambeam_macros beambeam_macros";
 system, "ln -fns tracking_tools/errors errors";  
 
 
+! Execute user-defined customization script if present
+system, "bash customization.bash"
+
+
 !*************************!
 !  General configuration  !
 !*************************!

diff --git a/python_examples/hl_lhc_collisions_python/000_pymask.py b/python_examples/hl_lhc_collisions_python/000_pymask.py
@@ -18,7 +18,7 @@
 #mode = 'b1_with_bb_legacy_macros'
 #mode = 'b4_without_bb'
 #mode = 'b4_from_b2_without_bb'
-#mode = 'b4_from_b2_with_bb'
+mode = 'b4_from_b2_with_bb'
 
 # Tolarances for checks [ip1, ip2, ip5, ip8]
 tol_beta = [1e-3, 10e-2, 1e-3, 1e-2]

diff --git a/python_examples/hl_lhc_collisions_python/t005_check_crabs.py b/python_examples/hl_lhc_collisions_python/t005_check_crabs.py
@@ -19,12 +19,12 @@
 phi_weak = Phi
 phi_c_weak = Phi_c
 
-# B1 ip1
-beam_track = 'b1'
-ip_choice = 1
-plane = 'x'
-phi_weak = Phi
-phi_c_weak = Phi_c
+# # B1 ip1
+# beam_track = 'b1'
+# ip_choice = 1
+# plane = 'x'
+# phi_weak = Phi
+# phi_c_weak = Phi_c
 
 # # B4 ip5
 # beam_track = 'b4'
@@ -33,12 +33,12 @@
 # phi_weak = Phi
 # phi_c_weak = Phi_c
 
-# B4 ip1
-beam_track = 'b4'
-ip_choice = 1
-plane = 'x'
-phi_weak = -Phi
-phi_c_weak = -Phi_c
+# # B4 ip1
+# beam_track = 'b4'
+# ip_choice = 1
+# plane = 'x'
+# phi_weak = -Phi
+# phi_c_weak = -Phi_c
 
 phi_strong = -phi_weak
 phi_c_strong = -phi_c_weak