Use the correct knobs for Run3 (#366)

* This updates so we can use the correct knobs in Run3.

* Only if 2022 is activated and added the macros.

* Renamed and added a comment to clarify the macros.

* Removed paranthesis.

Author: tpersson

omc3/model/accelerators/lhc.py

@@ -96,6 +96,7 @@
     B2_SETTINGS_MADX,
     GENERAL_MACROS,
     LHC_MACROS,
+    LHC_MACROS_RUN3,
     MACROS_DIR,
     MODIFIER_TAG,
 )
@@ -322,6 +323,13 @@ def get_base_madx_script(self, best_knowledge: bool = False) -> str:
             # f"option, -echo;\n"
             f"call, file = '{self.model_dir / MACROS_DIR / GENERAL_MACROS}';\n"
             f"call, file = '{self.model_dir / MACROS_DIR / LHC_MACROS}';\n"
+            )
+        if self.year == "2022":
+            madx_script += (
+                f"call, file = '{self.model_dir / MACROS_DIR / LHC_MACROS_RUN3}';\n"
+            )
+
+        madx_script += (
             f'title, "LHC Model created by OMC3";\n'
             f"{self.load_main_seq_madx()}\n"
             f"exec, define_nominal_beams();\n"

omc3/model/constants.py

@@ -23,6 +23,7 @@
 
 GENERAL_MACROS = "general.macros.madx"
 LHC_MACROS = "lhc.macros.madx"
+LHC_MACROS_RUN3 = "lhc.macros.run3.madx"
 
 B2_SETTINGS_MADX = "b2_settings.madx"
 B2_ERRORS_TFS = "b2_errors.tfs"

omc3/model/madx_macros/lhc.macros.run3.madx

@@ -0,0 +1,33 @@
+/*
+* Macros for runIII of the LHC using the new standard of the _op for the knobs used in operation.
+*/
+
+!requires general.macros.madx
+
+
+/*
+* Performs the matching of the LHC tunes, adapted to ATS optics.
+* @param qx: The horizontal tune to match to.
+* @param qy: The vertical tune to match to.
+* @param beam_number: The beam to use either 1 or 2.
+*/
+match_tunes_ats(nqx, nqy, beam_number): macro = {
+    exec, find_complete_tunes(nqx, nqy, beam_number);
+        match;
+        vary, name=dQx_op.bbeam_number_sq;
+        vary, name=dQy_op.bbeam_number_sq;
+        constraint, range=#E, mux=total_qx, muy=total_qy;
+        lmdif;
+        endmatch;
+};
+
+/*
+* Coupling knobs convention for Run3
+*/
+coupling_knob_ats(beam_number): macro = {
+        Cmrs.b1_op := b1_re_ip7_knob;
+        Cmrs.b2_op := b2_re_ip7_knob;
+        Cmis.b1_op := b1_im_ip7_knob;
+        Cmis.b2_op := b2_im_ip7_knob;  
+};
+

omc3/model/model_creators/lhc_model_creator.py

@@ -20,6 +20,7 @@
     ERROR_DEFFS_TXT,
     GENERAL_MACROS,
     LHC_MACROS,
+    LHC_MACROS_RUN3,
     MACROS_DIR,
     TWISS_AC_DAT,
     TWISS_ADT_DAT,
@@ -100,6 +101,7 @@ def prepare_run(cls, accel: Lhc) -> None:
         lib_path = Path(__file__).parent.parent / "madx_macros"
         shutil.copy(lib_path / GENERAL_MACROS, macros_path / GENERAL_MACROS)
         shutil.copy(lib_path / LHC_MACROS, macros_path / LHC_MACROS)
+        shutil.copy(lib_path / LHC_MACROS_RUN3, macros_path / LHC_MACROS_RUN3)
 
         if accel.energy is not None:
             LOGGER.debug("Copying B2 error files for given energy in model directory")