Auto stash before merge of "master" and "origin/master"

rtesse · Aug 6, 2020 · cc0ebb6 · cc0ebb6
1 parent 8e9c942
commit cc0ebb6
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 70 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
-yaml
+PyYAML
diff --git a/zgoubi_metadata/data/elements_yaml/BEND.yaml b/zgoubi_metadata/data/elements_yaml/BEND.yaml
@@ -1,7 +1,7 @@
 zgoubi_name: BEND
 params:
   IL: {type: I, default: 0, doc: ""}
-  XL: {type: E, unit: cm, default: 0, doc: ""}
+  XL: {type: E, unit: 'cm', default: 0, doc: ""}
   Sk: {type: E, unit: "", default: 0, doc: ""}
   B1: {type: E, unit: "", default: 0, doc: ""}
   X_E: {type: E, unit: "", default: 0, doc: ""}

diff --git a/zgoubi_metadata/data/elements_yaml/CAVITE.yaml b/zgoubi_metadata/data/elements_yaml/CAVITE.yaml
@@ -18,7 +18,7 @@ cond_section:
 - key: IOPT
   equals: 1
   template:
-  - - !!str L
+  - - L
     - h
   - - V
     - X

diff --git a/zgoubi_metadata/data/elements_yaml/DIPOLES.yaml b/zgoubi_metadata/data/elements_yaml/DIPOLES.yaml
@@ -4,10 +4,10 @@ params:
   N: {type: I, default: 0, doc: ""}
   AT: {type: E, unit: "", default: 0, doc: ""}
   RM: {type: E, unit: cm, default: 0, doc: ""}
-  KID: {type: E, unit: "", default: 0, doc: ""}
-  REOL: {type: I, default: 0, doc: ""}
-  XPS: {type: E, unit: cm, default: 0, doc: ""}
-  KPS: {type: I, default: 0, doc: ""}
+  KIRD: {type: E, unit: "", default: 0, doc: ""}
+  RESOL: {type: I, default: 0, doc: ""}
+  XPAS: {type: E, unit: cm, default: 0, doc: ""}
+  KPOS: {type: I, default: 0, doc: ""}
   RE: {type: E, unit: cm, default: 0, doc: ""}
   TE: {type: E, unit: "", default: 0, doc: ""}
   RS: {type: E, unit: cm, default: 0, doc: ""}
@@ -29,69 +29,69 @@ template:
 subelements:
   field_region:
     params:
-    - ACN: {type: E, unit: "", default: 0, doc: ""}
-    - DELTA_RM: {type: E, unit: "", default: 0, doc: ""}
-    - B_0: {type: E, unit: "", default: 0, doc: ""}
-    - IND: {type: I, default: 0, doc: ""}
-    - BCOEF1: {type: E, unit: "", default: 0, doc: ""}
-    - BCOEF2: {type: E, unit: "", default: 0, doc: ""}
-    - BCOEF3: {type: E, unit: "", default: 0, doc: ""}
-    - BCOEF4: {type: E, unit: "", default: 0, doc: ""}
-    - BCOEF5: {type: E, unit: "", default: 0, doc: ""}
-    - BCOEF6: {type: E, unit: "", default: 0, doc: ""}
-    - BCOEF7: {type: E, unit: "", default: 0, doc: ""}
-    - BCOEF8: {type: E, unit: "", default: 0, doc: ""}
-    - BCOEF9: {type: E, unit: "", default: 0, doc: ""}
-    - BCOEF10: {type: E, unit: "", default: 0, doc: ""}
-    - G0_E: {type: E, unit: "", default: 0, doc: ""}
-    - KAPPA_E: {type: E, unit: "", default: 0, doc: ""}
-    - NCE: {type: I, default: 0, doc: ""}
-    - CE_0: {type: E, unit: "", default: 0, doc: ""}
-    - CE_1: {type: E, unit: "", default: 0, doc: ""}
-    - CE_2: {type: E, unit: "", default: 0, doc: ""}
-    - CE_3: {type: E, unit: "", default: 0, doc: ""}
-    - CE_4: {type: E, unit: "", default: 0, doc: ""}
-    - CE_5: {type: E, unit: "", default: 0, doc: ""}
-    - SHIFT_E: {type: E, unit: "", default: 0, doc: ""}
-    - OMEGA_E: {type: E, unit: "", default: 0, doc: ""}
-    - THETA_E: {type: E, unit: "", default: 0, doc: ""}
-    - R1_E: {type: E, unit: "", default: 0, doc: ""}
-    - U1_E: {type: E, unit: "", default: 0, doc: ""}
-    - U2_E: {type: E, unit: "", default: 0, doc: ""}
-    - R2_E: {type: E, unit: "", default: 0, doc: ""}
-    - G0_S: {type: E, unit: "", default: 0, doc: ""}
-    - KAPPA_S: {type: E, unit: "", default: 0, doc: ""}
-    - NCS: {type: I, default: 0, doc: ""}
-    - CS_0: {type: E, unit: "", default: 0, doc: ""}
-    - CS_1: {type: E, unit: "", default: 0, doc: ""}
-    - CS_2: {type: E, unit: "", default: 0, doc: ""}
-    - CS_3: {type: E, unit: "", default: 0, doc: ""}
-    - CS_4: {type: E, unit: "", default: 0, doc: ""}
-    - CS_5: {type: E, unit: "", default: 0, doc: ""}
-    - SHIFT_S: {type: E, unit: "", default: 0, doc: ""}
-    - OMEGA_S: {type: E, unit: "", default: 0, doc: ""}
-    - THETA_S: {type: E, unit: "", default: 0, doc: ""}
-    - R1_S: {type: E, unit: "", default: 0, doc: ""}
-    - U1_S: {type: E, unit: "", default: 0, doc: ""}
-    - U2_S: {type: E, unit: "", default: 0, doc: ""}
-    - R2_S: {type: E, unit: "", default: 0, doc: ""}
-    - G0_L: {type: E, unit: "", default: 0, doc: ""}
-    - KAPPA_L: {type: E, unit: "", default: 0, doc: ""}
-    - NCL: {type: I, default: 0, doc: ""}
-    - CL_0: {type: E, unit: "", default: 0, doc: ""}
-    - CL_1: {type: E, unit: "", default: 0, doc: ""}
-    - CL_2: {type: E, unit: "", default: 0, doc: ""}
-    - CL_3: {type: E, unit: "", default: 0, doc: ""}
-    - CL_4: {type: E, unit: "", default: 0, doc: ""}
-    - CL_5: {type: E, unit: "", default: 0, doc: ""}
-    - SHIFT_L: {type: E, unit: "", default: 0, doc: ""}
-    - OMEGA_L: {type: E, unit: "", default: 0, doc: ""}
-    - THETA_L: {type: E, unit: "", default: 0, doc: ""}
-    - R1_L: {type: E, unit: "", default: 0, doc: ""}
-    - U1_L: {type: E, unit: "", default: 0, doc: ""}
-    - U2_L: {type: E, unit: "", default: 0, doc: ""}
-    - R2_L: {type: E, unit: "", default: 0, doc: ""}
-    - R3: {type: E, unit: "", default: 0, doc: ""}
+      ACN: {type: E, unit: "", default: 7777, doc: "TESTEST"}
+      DELTA_RM: {type: E, unit: "", default: 0, doc: ""}
+      B_0: {type: E, unit: "", default: 0, doc: ""}
+      IND: {type: I, default: 0, doc: ""}
+      BCOEF1: {type: E, unit: "", default: 0, doc: ""}
+      BCOEF2: {type: E, unit: "", default: 0, doc: ""}
+      BCOEF3: {type: E, unit: "", default: 0, doc: ""}
+      BCOEF4: {type: E, unit: "", default: 0, doc: ""}
+      BCOEF5: {type: E, unit: "", default: 0, doc: ""}
+      BCOEF6: {type: E, unit: "", default: 0, doc: ""}
+      BCOEF7: {type: E, unit: "", default: 0, doc: ""}
+      BCOEF8: {type: E, unit: "", default: 0, doc: ""}
+      BCOEF9: {type: E, unit: "", default: 0, doc: ""}
+      BCOEF10: {type: E, unit: "", default: 0, doc: ""}
+      G0_E: {type: E, unit: "", default: 0, doc: ""}
+      KAPPA_E: {type: E, unit: "", default: 0, doc: ""}
+      NCE: {type: I, default: 0, doc: ""}
+      CE_0: {type: E, unit: "", default: 0, doc: ""}
+      CE_1: {type: E, unit: "", default: 0, doc: ""}
+      CE_2: {type: E, unit: "", default: 0, doc: ""}
+      CE_3: {type: E, unit: "", default: 0, doc: ""}
+      CE_4: {type: E, unit: "", default: 0, doc: ""}
+      CE_5: {type: E, unit: "", default: 0, doc: ""}
+      SHIFT_E: {type: E, unit: "", default: 0, doc: ""}
+      OMEGA_E: {type: E, unit: "", default: 0, doc: ""}
+      THETA_E: {type: E, unit: "", default: 0, doc: ""}
+      R1_E: {type: E, unit: "", default: 0, doc: ""}
+      U1_E: {type: E, unit: "", default: 0, doc: ""}
+      U2_E: {type: E, unit: "", default: 0, doc: ""}
+      R2_E: {type: E, unit: "", default: 0, doc: ""}
+      G0_S: {type: E, unit: "", default: 0, doc: ""}
+      KAPPA_S: {type: E, unit: "", default: 0, doc: ""}
+      NCS: {type: I, default: 0, doc: ""}
+      CS_0: {type: E, unit: "", default: 0, doc: ""}
+      CS_1: {type: E, unit: "", default: 0, doc: ""}
+      CS_2: {type: E, unit: "", default: 0, doc: ""}
+      CS_3: {type: E, unit: "", default: 0, doc: ""}
+      CS_4: {type: E, unit: "", default: 0, doc: ""}
+      CS_5: {type: E, unit: "", default: 0, doc: ""}
+      SHIFT_S: {type: E, unit: "", default: 0, doc: ""}
+      OMEGA_S: {type: E, unit: "", default: 0, doc: ""}
+      THETA_S: {type: E, unit: "", default: 0, doc: ""}
+      R1_S: {type: E, unit: "", default: 0, doc: ""}
+      U1_S: {type: E, unit: "", default: 0, doc: ""}
+      U2_S: {type: E, unit: "", default: 0, doc: ""}
+      R2_S: {type: E, unit: "", default: 0, doc: ""}
+      G0_L: {type: E, unit: "", default: 0, doc: ""}
+      KAPPA_L: {type: E, unit: "", default: 0, doc: ""}
+      NCL: {type: I, default: 0, doc: ""}
+      CL_0: {type: E, unit: "", default: 0, doc: ""}
+      CL_1: {type: E, unit: "", default: 0, doc: ""}
+      CL_2: {type: E, unit: "", default: 0, doc: ""}
+      CL_3: {type: E, unit: "", default: 0, doc: ""}
+      CL_4: {type: E, unit: "", default: 0, doc: ""}
+      CL_5: {type: E, unit: "", default: 0, doc: ""}
+      SHIFT_L: {type: E, unit: "", default: 0, doc: ""}
+      OMEGA_L: {type: E, unit: "", default: 0, doc: ""}
+      THETA_L: {type: E, unit: "", default: 0, doc: ""}
+      R1_L: {type: E, unit: "", default: 0, doc: ""}
+      U1_L: {type: E, unit: "", default: 0, doc: ""}
+      U2_L: {type: E, unit: "", default: 0, doc: ""}
+      R2_L: {type: E, unit: "", default: 0, doc: ""}
+      R3: {type: E, unit: "", default: 0, doc: ""}
     template:
     - - ACN
       - DELTA_RM
@@ -157,3 +157,4 @@ subelements:
       - R2_L
       - R3
 doc: |
+    Coucou
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ cond_section: @@
     - key: IOPT
       equals: 1
       template:
-      - - !!str L
+      - - L
         - h
       - - V
         - X
@@ Expand Down @@