Add markers

latticejson/map.json

@@ -1,6 +1,7 @@
 {
  "description": "LatticeJSON, elegant, MADX",
  "map": [
+ ["Marker", ["MARK"], ["MARKER"]],
  ["Drift", ["DRIF", "DRIFT"], ["DRIFT"], ["DRIFT"]],
  ["Dipole", ["CSBEND", "SBEND", "BEND"], ["SBEND", "RBEND"]],
  ["Quadrupole", ["KQUAD", "QUAD", "QUADRUPOLE"], ["QUADRUPOLE"]],

latticejson/schema.json

@@ -50,6 +50,9 @@
  "patternProperties": {
  "^.*$": {
  "oneOf": [
+ {
+ "$ref": "#/definitions/Marker"
+ },
  {
  "$ref": "#/definitions/Drift"
  },
@@ -119,6 +122,25 @@
  }
  ]
  },
+ "Marker": {
+ "items": [
+ {
+ "const": "Marker"
+ },
+ {
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "info": {},
+ "length": {},
+ "dx": {},
+ "dy": {},
+ "ds": {},
+ "tilt": {}
+ }
+ }
+ ]
+ },
  "Drift": {
  "allOf": [
  {

tests/data/fodo.json

@@ -4,13 +4,14 @@
  "info": "This is the simplest possible strong focusing lattice.",
  "root": "RING",
  "elements": {
+ "M1": ["Marker", {}],
  "D1": ["Drift", {"length": 0.55}],
  "Q1": ["Quadrupole", {"length": 0.2, "k1": 1.2}],
  "Q2": ["Quadrupole", {"length": 0.4, "k1": -1.2}],
- "B1": ["Dipole", {"length": 1.5, "angle": 0.392701, "e1": 0.1963505, "e2": 0.1963505}]
+ "B1": ["Dipole", {"length": 1.5, "angle": 0.39269908169872414 , "e1": 0.19634954084936207 ,"e2": 0.19634954084936207}]
  },
  "lattices": {
- "CELL": ["Q1", "D1", "B1", "D1", "Q2", "D1", "B1", "D1", "Q1"],
+ "CELL": ["M1", "Q1", "D1", "B1", "D1", "Q2", "D1", "B1", "D1", "Q1"],
  "RING": ["CELL", "CELL", "CELL", "CELL", "CELL", "CELL", "CELL", "CELL"]
  }
 }

tests/data/fodo.lte

@@ -8,7 +8,8 @@ Q1 :KQUAD, L="2 10 /", K1=1.2
 % pi 8 / sto angle
 % 1 atan 4 * sto custom_pi
 
+M1 : MARK
 B1 : CSBEND, L=.15e+1, ANGLE="angle", &
  E1="pi 16 /", e2="custom_pi 16 /"
-FODO : LINE = (Q1, D1, B1, D1, Q2, D1, B1, D1, Q1)
-RING : LINE = (2*(-2*-(2*FODO)))
+CELL : LINE = (M1, Q1, D1, B1, D1, Q2, D1, B1, D1, Q1)
+RING : LINE = (2*(-2*-(2*CELL)))

tests/data/fodo.madx

@@ -20,9 +20,10 @@ D1: DRIFT, L=0.55; !! comment with two !!
 ! * multiline comment
 ! */
 
+M1 : MARKER;
 B1 : SBEND, L=1.5, ANGLE=TWOPI/16, // MAD supports inline evaluation
  E1=0.1963505 * 2 / 2, E2=PI/16;
-SUB : LINE = (Q1, D1, B1, D1);
+SUB : LINE = (M1, Q1, D1, B1, D1);
 FODO : LINE = (SUB, Q2, -SUB);
 RING : LINE = 2 * (FODO, FODO, FODO, FODO);
 USE, RING;

tests/test_convert.py

@@ -10,13 +10,31 @@
 
 
 def test_to_elegant():
+ expected = (
+ "! TITLE: FODO Lattice\n"
+ "M1: MARK, \n"
+ "D1: DRIF, L=0.55\n"
+ "Q1: KQUAD, L=0.2, K1=1.2\n"
+ "Q2: KQUAD, L=0.4, K1=-1.2\n"
+ "B1: CSBEND, L=1.5, ANGLE=0.39269908169872414, E1=0.19634954084936207, "
+ "E2=0.19634954084936207\n"
+ "CELL: LINE=(M1, Q1, D1, B1, D1, Q2, D1, B1, D1, Q1)\n"
+ "RING: LINE=(CELL, CELL, CELL, CELL, CELL, CELL, CELL, CELL)\n"
+ "USE, RING\n"
+ )
+
  elegant = to_elegant(fodo_json)
  print(elegant)
+ assert expected == elegant
 
 
 def test_from_elegant():
  latticejson = from_elegant(fodo_lte)
+ latticejson.pop("title")
+ fodo_json.pop("info")
+ fodo_json.pop("title")
  print(latticejson)
+ assert sorted(latticejson.items()) == sorted(fodo_json.items())
 
 
 # Uncomment to test for elegant examples