Adjust correction-knob json files for 2023 (#425)

* removed Q4Q5Q6 from default, added categories with all and for HB * adapt test to new category name
pylhc · Aug 29, 2023 · f818079 · f818079
1 parent 1cd4378
commit f818079
Show file tree

Hide file tree

Showing 4 changed files with 263 additions and 2 deletions.
diff --git a/omc3/model/accelerators/lhc/2012/correctors/correctors_b1/beta_correctors.json b/omc3/model/accelerators/lhc/2012/correctors/correctors_b1/beta_correctors.json
@@ -18,6 +18,118 @@
     "kqf.a81"
   ], 
   "MQM": [
+    "kq6.l3b1", 
+    "kq6.r3b1", 
+    "kq7.r1b1", 
+    "kq8.r1b1", 
+    "kq9.r1b1", 
+    "kq10.r1b1", 
+    "kq10.l2b1", 
+    "kq9.l2b1", 
+    "kq8.l2b1", 
+    "kq7.l2b1", 
+    "kq6.l2b1", 
+    "kq5.r2b1", 
+    "kq6.r2b1", 
+    "kq7.r2b1", 
+    "kq8.r2b1", 
+    "kq9.r2b1", 
+    "kq10.r2b1", 
+    "kq10.l4b1", 
+    "kq9.l4b1", 
+    "kq8.l4b1", 
+    "kq7.l4b1", 
+    "kq7.r4b1", 
+    "kq8.r4b1", 
+    "kq9.r4b1", 
+    "kq10.r4b1", 
+    "kq10.l5b1", 
+    "kq9.l5b1", 
+    "kq8.l5b1", 
+    "kq7.l5b1", 
+    "kq7.r5b1", 
+    "kq8.r5b1", 
+    "kq9.r5b1", 
+    "kq10.r5b1", 
+    "kq10.l6b1", 
+    "kq9.l6b1", 
+    "kq8.l6b1", 
+    "kq8.r6b1", 
+    "kq9.r6b1", 
+    "kq10.r6b1", 
+    "kq10.l8b1", 
+    "kq9.l8b1", 
+    "kq8.l8b1", 
+    "kq7.l8b1", 
+    "kq6.l8b1", 
+    "kq5.l8b1", 
+    "kq6.r8b1", 
+    "kq7.r8b1", 
+    "kq8.r8b1", 
+    "kq9.r8b1", 
+    "kq10.r8b1", 
+    "kq10.l1b1", 
+    "kq9.l1b1", 
+    "kq6.l7b1", 
+    "kq6.r7b1", 
+    "kq8.l1b1", 
+    "kq7.l1b1" 
+  ], 
+  "MQM_HB": [
+    "kq6.l3b1", 
+    "kq6.r3b1", 
+    "kq8.r1b1", 
+    "kq9.r1b1", 
+    "kq10.r1b1", 
+    "kq10.l2b1", 
+    "kq9.l2b1", 
+    "kq8.l2b1", 
+    "kq7.l2b1", 
+    "kq6.l2b1", 
+    "kq5.r2b1", 
+    "kq6.r2b1", 
+    "kq7.r2b1", 
+    "kq8.r2b1", 
+    "kq9.r2b1", 
+    "kq10.r2b1", 
+    "kq10.l4b1", 
+    "kq9.l4b1", 
+    "kq8.l4b1", 
+    "kq7.l4b1", 
+    "kq7.r4b1", 
+    "kq8.r4b1", 
+    "kq9.r4b1", 
+    "kq10.r4b1", 
+    "kq10.l5b1", 
+    "kq9.l5b1", 
+    "kq8.l5b1", 
+    "kq8.r5b1", 
+    "kq9.r5b1", 
+    "kq10.r5b1", 
+    "kq10.l6b1", 
+    "kq9.l6b1", 
+    "kq8.l6b1", 
+    "kq8.r6b1", 
+    "kq9.r6b1", 
+    "kq10.r6b1", 
+    "kq10.l8b1", 
+    "kq9.l8b1", 
+    "kq8.l8b1", 
+    "kq7.l8b1", 
+    "kq6.l8b1", 
+    "kq5.l8b1", 
+    "kq6.r8b1", 
+    "kq7.r8b1", 
+    "kq8.r8b1", 
+    "kq9.r8b1", 
+    "kq10.r8b1", 
+    "kq10.l1b1", 
+    "kq9.l1b1", 
+    "kq6.l7b1", 
+    "kq6.r7b1", 
+    "kq8.l1b1" 
+  ], 
+  "MQM_Q5Q6Q7": [
     "kq5.r1b1", 
     "kq6.l3b1", 
     "kq6.r3b1", 
@@ -181,6 +293,34 @@
     "kqt5.r7"
   ], 
   "MQY": [
+    "kq4.l2b1", 
+    "kq4.r2b1", 
+    "kq6.l4b1", 
+    "kq5.l4b1", 
+    "kq5.r4b1", 
+    "kq6.r4b1", 
+    "kq5.l6b1", 
+    "kq4.r6b1", 
+    "kq5.r6b1", 
+    "kq4.l8b1", 
+    "kq4.r8b1", 
+    "kq5.r8b1" 
+  ], 
+  "MQY_Q4": [
+    "kq4.l2b1", 
+    "kq4.r2b1", 
+    "kq6.l4b1", 
+    "kq5.l4b1", 
+    "kq5.r4b1", 
+    "kq6.r4b1", 
+    "kq5.l6b1", 
+    "kq4.r6b1", 
+    "kq5.r6b1", 
+    "kq4.l8b1", 
+    "kq4.r8b1", 
+    "kq5.r8b1" 
+  ], 
+  "MQY_Q4": [
     "kq4.r1b1", 
     "kq4.l2b1", 
     "kq4.r2b1", 

diff --git a/omc3/model/accelerators/lhc/2012/correctors/correctors_b2/beta_correctors.json b/omc3/model/accelerators/lhc/2012/correctors/correctors_b2/beta_correctors.json
@@ -18,6 +18,114 @@
     "kqd.a81"
   ], 
   "MQM": [
+    "kq7.r1b2", 
+    "kq8.r1b2", 
+    "kq9.r1b2", 
+    "kq10.r1b2", 
+    "kq10.l2b2", 
+    "kq9.l2b2", 
+    "kq8.l2b2", 
+    "kq7.l2b2", 
+    "kq6.l2b2", 
+    "kq5.r2b2", 
+    "kq6.r2b2", 
+    "kq7.r2b2", 
+    "kq8.r2b2", 
+    "kq9.r2b2", 
+    "kq10.r2b2", 
+    "kq10.l4b2", 
+    "kq9.l4b2", 
+    "kq8.l4b2", 
+    "kq7.l4b2", 
+    "kq7.r4b2", 
+    "kq8.r4b2", 
+    "kq9.r4b2", 
+    "kq10.r4b2", 
+    "kq10.l5b2", 
+    "kq9.l5b2", 
+    "kq8.l5b2", 
+    "kq7.l5b2", 
+    "kq7.r5b2", 
+    "kq8.r5b2", 
+    "kq9.r5b2", 
+    "kq10.r5b2", 
+    "kq10.l6b2", 
+    "kq9.l6b2", 
+    "kq8.l6b2", 
+    "kq8.r6b2", 
+    "kq9.r6b2", 
+    "kq10.r6b2", 
+    "kq10.l8b2", 
+    "kq9.l8b2", 
+    "kq8.l8b2", 
+    "kq7.l8b2", 
+    "kq6.l8b2", 
+    "kq5.l8b2", 
+    "kq6.r8b2", 
+    "kq7.r8b2", 
+    "kq8.r8b2", 
+    "kq9.r8b2", 
+    "kq6.l3b2", 
+    "kq6.r3b2", 
+    "kq10.r8b2", 
+    "kq10.l1b2", 
+    "kq9.l1b2", 
+    "kq8.l1b2", 
+    "kq7.l1b2" 
+  ], 
+  "MQM_HB": [
+    "kq8.r1b2", 
+    "kq9.r1b2", 
+    "kq10.r1b2", 
+    "kq10.l2b2", 
+    "kq9.l2b2", 
+    "kq8.l2b2", 
+    "kq7.l2b2", 
+    "kq6.l2b2", 
+    "kq5.r2b2", 
+    "kq6.r2b2", 
+    "kq7.r2b2", 
+    "kq8.r2b2", 
+    "kq9.r2b2", 
+    "kq10.r2b2", 
+    "kq10.l4b2", 
+    "kq9.l4b2", 
+    "kq8.l4b2", 
+    "kq7.l4b2", 
+    "kq7.r4b2", 
+    "kq8.r4b2", 
+    "kq9.r4b2", 
+    "kq10.r4b2", 
+    "kq10.l5b2", 
+    "kq9.l5b2", 
+    "kq8.l5b2", 
+    "kq8.r5b2", 
+    "kq9.r5b2", 
+    "kq10.r5b2", 
+    "kq10.l6b2", 
+    "kq9.l6b2", 
+    "kq8.l6b2", 
+    "kq8.r6b2", 
+    "kq9.r6b2", 
+    "kq10.r6b2", 
+    "kq10.l8b2", 
+    "kq9.l8b2", 
+    "kq8.l8b2", 
+    "kq7.l8b2", 
+    "kq6.l8b2", 
+    "kq5.l8b2", 
+    "kq6.r8b2", 
+    "kq7.r8b2", 
+    "kq8.r8b2", 
+    "kq9.r8b2", 
+    "kq6.l3b2", 
+    "kq6.r3b2", 
+    "kq10.r8b2", 
+    "kq10.l1b2", 
+    "kq9.l1b2", 
+    "kq8.l1b2" 
+  ], 
+  "MQM_Q5Q6Q7": [
     "kq5.r1b2", 
     "kq6.r1b2", 
     "kq7.r1b2", 
@@ -182,6 +290,19 @@
     "kqt5.r7"
   ], 
   "MQY": [
+    "kq5.l2b2", 
+    "kq4.l2b2", 
+    "kq4.r2b2", 
+    "kq6.l4b2", 
+    "kq5.l4b2", 
+    "kq5.r4b2", 
+    "kq6.r4b2", 
+    "kq5.l6b2", 
+    "kq5.r6b2", 
+    "kq4.l8b2", 
+    "kq4.r8b2" 
+  ], 
+  "MQY_Q4": [
     "kq4.r1b2", 
     "kq5.l2b2", 
     "kq4.l2b2", 

diff --git a/tests/accuracy/test_global_correction.py b/tests/accuracy/test_global_correction.py
@@ -74,7 +74,7 @@ def get_normal_params(beam):
         correction_filename=CORRECTION_TEST_INPUTS / f"changeparameters_injb{beam}_quadrupole.madx",
         optics_params=[f"{PHASE}X", f"{PHASE}Y", f"{BETA}X", f"{BETA}Y", f"{NORM_DISPERSION}X", TUNE],
         weights=[1., 1., 1., 1., 1., 1.],
-        variables=["MQY"],
+        variables=["MQY_Q4"],
         fullresponse="fullresponse_MQY.h5",
         seed=12368,  # iteration test might not work with other seeds (converges too fast)
     )

diff --git a/tests/accuracy/test_response_creator.py b/tests/accuracy/test_response_creator.py
@@ -45,7 +45,7 @@ def test_response_accuracy(model_inj_beams, orientation, creator):
     # compare to original response matrix
     original_response = read_fullresponse(model_inj_beams.model_dir / correction_params.fullresponse)
     for key in optics_params:
-        original = original_response[key]
+        original = original_response[key.replace("_Q4", "")]  # renaming of category since response creation 
         new = new_response[key].loc[original.index, original.columns]
 
         # ######## Relative RMS check ###############