Merged submodules in 01

lhcopt · Jun 18, 2020 · ce6c057 · ce6c057
1 parent 21a96e4
commit ce6c057
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 18 deletions.
diff --git a/examples/hl_lhc_collisions_python/000_pymask.py b/examples/hl_lhc_collisions_python/000_pymask.py
@@ -86,8 +86,7 @@
 
 # Crossing-save and some reference measurements
 mad.input('exec, crossing_save')
-mad.call("modules/submodule_01e_test.madx")
-mad.call("modules/submodule_01f_use.madx")
+mad.call("modules/submodule_01e_final.madx")
 
 # Test flat machine
 mad.input('exec, crossing_disable')

diff --git a/module_01_orbit.madx b/module_01_orbit.madx
@@ -12,10 +12,9 @@ call, file="modules/submodule_01a_preparation.madx";
 call, file="modules/submodule_01b_beam.madx";
 call, file="modules/submodule_01c_phase.madx";
 call, file="modules/submodule_01d_crossing.madx";
-call, file="modules/submodule_01e_test.madx";
-call, file="modules/submodule_01f_use.madx";
+call, file="modules/submodule_01e_final.madx";
 
 !print, text="==================================================";
 !print, text="======  OPTICS PARAMETERS: UNPERTURBED  ==========";
 !print, text="==================================================";
-!call, file="tools/get_optics_params.madx";
+!call, file="tools/get_optics_params.madx";
diff --git a/submodule_01e_final.madx b/submodule_01e_final.madx
@@ -1,14 +1,14 @@
 print, text="";
 print, text="";
-print, text="  --- Submodule 1e: test";
+print, text="  --- Submodule 1e: final";
 print, text="  ----------------------";
 print, text="";
 print, text="";
 
 
 
 !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++;
-!                        TEST the optics
+!                        STORE the optics
 !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++;
 
 exec, crossing_disable;
@@ -35,7 +35,6 @@ if (par_verbose==1){
   twiss, sequence=lhcb2, file=twiss_crossing_disable.b2;
   twiss, sequence=lhcb2, table=twisscrossingdisableb2; ! handle for further analysis
   system, "cat twiss_crossing_disable.b2";
-
 };
 
 ! Switch on the crossing scheme
@@ -54,11 +53,6 @@ if (par_verbose==1){
     system, "cat twiss_crossing_enable.b1";
   };
 
-  xnom1=table(twiss,IP1,x);pxnom1=table(twiss,IP1,px);ynom1=table(twiss,IP1,y);pynom1=table(twiss,IP1,py);
-  xnom2=table(twiss,IP2,x);pxnom2=table(twiss,IP2,px);ynom2=table(twiss,IP2,y);pynom2=table(twiss,IP2,py);
-  xnom5=table(twiss,IP5,x);pxnom5=table(twiss,IP5,px);ynom5=table(twiss,IP5,y);pynom5=table(twiss,IP5,py);
-  xnom8=table(twiss,IP8,x);pxnom8=table(twiss,IP8,px);ynom8=table(twiss,IP8,y);pynom8=table(twiss,IP8,py);
-
   use, sequence=lhcb2;
   select, flag=twiss,clear;
   select, flag=twiss, pattern="IP1", column=name,s,x,y,px,py;
@@ -68,9 +62,6 @@ if (par_verbose==1){
   twiss, sequence=lhcb2, file=twiss_crossing_enable.b2;
   twiss, sequence=lhcb2, table=twisscrossingenableb2;  ! handle for further analysis
   system, "cat twiss_crossing_enable.b2";
-
-  value, xnom1,xnom2,xnom5,xnom8;
-  value, ynom1,ynom2,ynom5,ynom8;
-  value, pxnom1,pxnom2,pxnom5,pxnom8;
-  value, pynom1,pynom2,pynom5,pynom8;
 };
+
+if(mylhcbeam==1) {use,  sequence=lhcb1;}; if(mylhcbeam>1) {use,  sequence=lhcb2;};