Introduced 04_1 module

lhcopt · Jun 18, 2020 · 469537d · 469537d
1 parent 76a8c3f
commit 469537d
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 16 deletions.
diff --git a/examples/hl_lhc_collision/main.mask b/examples/hl_lhc_collision/main.mask
@@ -151,23 +151,8 @@ call, file="optics.madx";
 call, file="modules/module_01_orbit.madx";
 call, file="modules/module_02_lumilevel.madx";
 call, file="modules/module_03_beambeam.madx";
-
-! Install and switch off crabs
-call, file="tools/enable_crabcavities.madx";
-on_crab1 = 0;
-on_crab5 = 0;
-
-!Save references
-call, file="modules/auxiliary_00_savereferences.madx";
-
-! Errors and tuning 
-on_disp = 0;
+call, file="modules/module_04_1_finalizeseq_storerefs.madx";
 call, file="modules/module_04_errors.madx";
 call, file="modules/module_05_tuning.madx";
-
-! Switch off crabs
-on_crab1 = par_crab1;
-on_crab5 = par_crab5;
-
 call, file="modules/module_06_generate.madx";
 
diff --git a/module_04_1_finalizeseq_storerefs.madx b/module_04_1_finalizeseq_storerefs.madx
@@ -0,0 +1,10 @@
+print, text="";
+print, text="";
+print, text="+++++++++++++++++++++++++++++++++++++++++++++++++++++";
+print, text="++ START MODULE 4.1: FINALIZE SEQ. AND STORE REFS +++";
+print, text="+++++++++++++++++++++++++++++++++++++++++++++++++++++";
+print, text="";
+print, text="";
+
+call, file="modules/submodule_04_1a_install_crabs.madx";
+call, file="modules/submodule_04_1b_save_references.madx";
diff --git a/submodule_04_1a_install_crabs.madx b/submodule_04_1a_install_crabs.madx
@@ -0,0 +1,11 @@
+print, text="";
+print, text="";
+print, text="  --- Submodule 4.1a: install crabs ";
+print, text="  --------------------------------- ";
+print, text="";
+print, text="";
+
+! Install and switch off crabs
+call, file="tools/enable_crabcavities.madx";
+on_crab1 = 0;
+on_crab5 = 0;
diff --git a/auxiliary_00_savereferences.madx → submodule_04_1b_save_references.madx b/auxiliary_00_savereferences.madx → submodule_04_1b_save_references.madx
@@ -1,3 +1,9 @@
+print, text="";
+print, text="";
+print, text="  --- Submodule 4.1a: store references ";
+print, text="  ------------------------------------ ";
+print, text="";
+print, text="";
 
 exec, crossing_disable;
 on_disp = 0;

diff --git a/submodule_05f_RF.madx b/submodule_05f_RF.madx
@@ -13,3 +13,6 @@ LAGRF400.B1=0.5;
 LAGRF400.B2=0.;
 VRF400 := par_vrf_total;
 
+! Switch on crabs
+on_crab1 = par_crab1;
+on_crab5 = par_crab5;