Make energy eV phys units and MeV eng units

T-Nicholls · T-Nicholls · commit 7310923c5518 · 2025-07-25T14:39:22.000+01:00
diff --git a/src/pytac/data/DIAD/simple_devices.csv b/src/pytac/data/DIAD/simple_devices.csv
@@ -1,2 +1,2 @@
 el_id,field,value,readonly
-0,energy,3000000000,True
+0,energy,3000,True
diff --git a/src/pytac/data/DIAD/uc_poly_data.csv b/src/pytac/data/DIAD/uc_poly_data.csv
@@ -1,6 +1,6 @@
 uc_id,coeff,val
 1,0,0.000000
-1,1,1e-06
+1,1,1e06
 2,0,0.000000
 2,1,1e-09
 3,0,0.000000
diff --git a/src/pytac/data/DIAD/unitconv.csv b/src/pytac/data/DIAD/unitconv.csv
@@ -4,7 +4,7 @@ el_id,field,uc_type,uc_id,phys_units,eng_units,lower_lim,upper_lim
 0,dispersion,null,0,m,m,,
 0,beam_current,null,0,A,A,,
 1492,f,null,0,Hz,Hz,,
-0,energy,poly,1,Gev,Mev,,
+0,energy,poly,1,eV,MeV,,
 0,emittance_x,poly,2,m,nm,,
 0,emittance_y,poly,3,m,pm,,
 5,b1,pchip,4,m^-2,A,0,200
diff --git a/src/pytac/data/DIADSP/simple_devices.csv b/src/pytac/data/DIADSP/simple_devices.csv
@@ -1,2 +1,2 @@
 el_id,field,value,readonly
-0,energy,3000000000,True
+0,energy,3000,True
diff --git a/src/pytac/data/DIADSP/uc_poly_data.csv b/src/pytac/data/DIADSP/uc_poly_data.csv
@@ -1,6 +1,6 @@
 uc_id,coeff,val
 1,0,0.000000
-1,1,1e-06
+1,1,1e06
 2,0,0.000000
 2,1,1e-09
 3,0,0.000000
diff --git a/src/pytac/data/DIADSP/unitconv.csv b/src/pytac/data/DIADSP/unitconv.csv
@@ -4,7 +4,7 @@ el_id,field,uc_type,uc_id,phys_units,eng_units,lower_lim,upper_lim
 0,dispersion,null,0,m,m,,
 0,beam_current,null,0,A,A,,
 1492,f,null,0,Hz,Hz,,
-0,energy,poly,1,Gev,Mev,,
+0,energy,poly,1,eV,MeV,,
 0,emittance_x,poly,2,m,nm,,
 0,emittance_y,poly,3,m,pm,,
 5,b1,pchip,4,m^-2,A,0,200
diff --git a/src/pytac/data/DIADTHz/simple_devices.csv b/src/pytac/data/DIADTHz/simple_devices.csv
@@ -1,2 +1,2 @@
 el_id,field,value,readonly
-0,energy,3000000000,True
+0,energy,3000,True
diff --git a/src/pytac/data/DIADTHz/uc_poly_data.csv b/src/pytac/data/DIADTHz/uc_poly_data.csv
@@ -1,6 +1,6 @@
 uc_id,coeff,val
 1,0,0.000000
-1,1,1e-06
+1,1,1e06
 2,0,0.000000
 2,1,1e-09
 3,0,0.000000
diff --git a/src/pytac/data/DIADTHz/unitconv.csv b/src/pytac/data/DIADTHz/unitconv.csv
@@ -4,7 +4,7 @@ el_id,field,uc_type,uc_id,phys_units,eng_units,lower_lim,upper_lim
 0,dispersion,null,0,m,m,,
 0,beam_current,null,0,A,A,,
 1492,f,null,0,Hz,Hz,,
-0,energy,poly,1,Gev,Mev,,
+0,energy,poly,1,eV,MeV,,
 0,emittance_x,poly,2,m,nm,,
 0,emittance_y,poly,3,m,pm,,
 5,b1,pchip,4,m^-2,A,0,200
diff --git a/src/pytac/data/I04/simple_devices.csv b/src/pytac/data/I04/simple_devices.csv
@@ -1,2 +1,2 @@
 el_id,field,value,readonly
-0,energy,3000000000,True
+0,energy,3000,True
diff --git a/src/pytac/data/I04/uc_poly_data.csv b/src/pytac/data/I04/uc_poly_data.csv
@@ -1,6 +1,6 @@
 uc_id,coeff,val
 1,0,0.000000
-1,1,1e-06
+1,1,1e06
 2,0,0.000000
 2,1,1e-09
 3,0,0.000000
diff --git a/src/pytac/data/I04/unitconv.csv b/src/pytac/data/I04/unitconv.csv
@@ -4,7 +4,7 @@ el_id,field,uc_type,uc_id,phys_units,eng_units,lower_lim,upper_lim
 0,dispersion,null,0,m,m,,
 0,beam_current,null,0,A,A,,
 1510,f,null,0,Hz,Hz,,
-0,energy,poly,1,Gev,Mev,,
+0,energy,poly,1,eV,MeV,,
 0,emittance_x,poly,2,m,nm,,
 0,emittance_y,poly,3,m,pm,,
 5,b1,pchip,4,m^-2,A,0,200
diff --git a/src/pytac/data/I04SP/simple_devices.csv b/src/pytac/data/I04SP/simple_devices.csv
@@ -1,2 +1,2 @@
 el_id,field,value,readonly
-0,energy,3000000000,True
+0,energy,3000,True
diff --git a/src/pytac/data/I04SP/uc_poly_data.csv b/src/pytac/data/I04SP/uc_poly_data.csv
@@ -1,6 +1,6 @@
 uc_id,coeff,val
 1,0,0.000000
-1,1,1e-06
+1,1,1e06
 2,0,0.000000
 2,1,1e-09
 3,0,0.000000
diff --git a/src/pytac/data/I04SP/unitconv.csv b/src/pytac/data/I04SP/unitconv.csv
@@ -4,7 +4,7 @@ el_id,field,uc_type,uc_id,phys_units,eng_units,lower_lim,upper_lim
 0,dispersion,null,0,m,m,,
 0,beam_current,null,0,A,A,,
 1510,f,null,0,Hz,Hz,,
-0,energy,poly,1,Gev,Mev,,
+0,energy,poly,1,eV,MeV,,
 0,emittance_x,poly,2,m,nm,,
 0,emittance_y,poly,3,m,pm,,
 5,b1,pchip,4,m^-2,A,0,200
diff --git a/src/pytac/data/I04THz/simple_devices.csv b/src/pytac/data/I04THz/simple_devices.csv
@@ -1,2 +1,2 @@
 el_id,field,value,readonly
-0,energy,3000000000,True
+0,energy,3000,True
diff --git a/src/pytac/data/I04THz/uc_poly_data.csv b/src/pytac/data/I04THz/uc_poly_data.csv
@@ -1,6 +1,6 @@
 uc_id,coeff,val
 1,0,0.000000
-1,1,1e-06
+1,1,1e06
 2,0,0.000000
 2,1,1e-09
 3,0,0.000000
diff --git a/src/pytac/data/I04THz/unitconv.csv b/src/pytac/data/I04THz/unitconv.csv
@@ -4,7 +4,7 @@ el_id,field,uc_type,uc_id,phys_units,eng_units,lower_lim,upper_lim
 0,dispersion,null,0,m,m,,
 0,beam_current,null,0,A,A,,
 1510,f,null,0,Hz,Hz,,
-0,energy,poly,1,Gev,Mev,,
+0,energy,poly,1,eV,MeV,,
 0,emittance_x,poly,2,m,nm,,
 0,emittance_y,poly,3,m,pm,,
 5,b1,pchip,4,m^-2,A,0,200
diff --git a/src/pytac/data/SRI0913_MOGA/simple_devices.csv b/src/pytac/data/SRI0913_MOGA/simple_devices.csv
@@ -1,2 +1,2 @@
 el_id,field,value,readonly
-0,energy,3000000000,True
+0,energy,3000,True
diff --git a/src/pytac/data/SRI0913_MOGA/uc_poly_data.csv b/src/pytac/data/SRI0913_MOGA/uc_poly_data.csv
@@ -1,6 +1,6 @@
 uc_id,coeff,val
 1,0,0.000000
-1,1,1e-06
+1,1,1e06
 2,0,0.000000
 2,1,1e-09
 3,0,0.000000
diff --git a/src/pytac/data/SRI0913_MOGA/unitconv.csv b/src/pytac/data/SRI0913_MOGA/unitconv.csv
@@ -4,7 +4,7 @@ el_id,field,uc_type,uc_id,phys_units,eng_units,lower_lim,upper_lim
 0,dispersion,null,0,m,m,,
 0,beam_current,null,0,A,A,,
 1492,f,null,0,Hz,Hz,,
-0,energy,poly,1,Gev,Mev,,
+0,energy,poly,1,eV,MeV,,
 0,emittance_x,poly,2,m,nm,,
 0,emittance_y,poly,3,m,pm,,
 5,b1,pchip,4,m^-2,A,0,200
diff --git a/src/pytac/data/VMX/simple_devices.csv b/src/pytac/data/VMX/simple_devices.csv
@@ -1,2 +1,2 @@
 el_id,field,value,readonly
-0,energy,3000000000,True
+0,energy,3000,True
diff --git a/src/pytac/data/VMX/uc_poly_data.csv b/src/pytac/data/VMX/uc_poly_data.csv
@@ -1,6 +1,6 @@
 uc_id,coeff,val
 1,0,0.000000
-1,1,1e-06
+1,1,1e06
 2,0,0.000000
 2,1,1e-09
 3,0,0.000000
diff --git a/src/pytac/data/VMX/unitconv.csv b/src/pytac/data/VMX/unitconv.csv
@@ -4,7 +4,7 @@ el_id,field,uc_type,uc_id,phys_units,eng_units,lower_lim,upper_lim
 0,dispersion,null,0,m,m,,
 0,beam_current,null,0,A,A,,
 1490,f,null,0,Hz,Hz,,
-0,energy,poly,1,Gev,Mev,,
+0,energy,poly,1,eV,MeV,,
 0,emittance_x,poly,2,m,nm,,
 0,emittance_y,poly,3,m,pm,,
 5,b1,pchip,4,m^-2,A,0,200
diff --git a/src/pytac/data/VMXSP/simple_devices.csv b/src/pytac/data/VMXSP/simple_devices.csv
@@ -1,2 +1,2 @@
 el_id,field,value,readonly
-0,energy,3000000000,True
+0,energy,3000,True
diff --git a/src/pytac/data/VMXSP/uc_poly_data.csv b/src/pytac/data/VMXSP/uc_poly_data.csv
@@ -1,6 +1,6 @@
 uc_id,coeff,val
 1,0,0.000000
-1,1,1e-06
+1,1,1e06
 2,0,0.000000
 2,1,1e-09
 3,0,0.000000
diff --git a/src/pytac/data/VMXSP/unitconv.csv b/src/pytac/data/VMXSP/unitconv.csv
@@ -4,7 +4,7 @@ el_id,field,uc_type,uc_id,phys_units,eng_units,lower_lim,upper_lim
 0,dispersion,null,0,m,m,,
 0,beam_current,null,0,A,A,,
 1490,f,null,0,Hz,Hz,,
-0,energy,poly,1,Gev,Mev,,
+0,energy,poly,1,eV,MeV,,
 0,emittance_x,poly,2,m,nm,,
 0,emittance_y,poly,3,m,pm,,
 5,b1,pchip,4,m^-2,A,0,200
diff --git a/src/pytac/data/VMXTHz/simple_devices.csv b/src/pytac/data/VMXTHz/simple_devices.csv
@@ -1,2 +1,2 @@
 el_id,field,value,readonly
-0,energy,3000000000,True
+0,energy,3000,True
diff --git a/src/pytac/data/VMXTHz/uc_poly_data.csv b/src/pytac/data/VMXTHz/uc_poly_data.csv
@@ -1,6 +1,6 @@
 uc_id,coeff,val
 1,0,0.000000
-1,1,1e-06
+1,1,1e06
 2,0,0.000000
 2,1,1e-09
 3,0,0.000000
diff --git a/src/pytac/data/VMXTHz/unitconv.csv b/src/pytac/data/VMXTHz/unitconv.csv
@@ -4,7 +4,7 @@ el_id,field,uc_type,uc_id,phys_units,eng_units,lower_lim,upper_lim
 0,dispersion,null,0,m,m,,
 0,beam_current,null,0,A,A,,
 1490,f,null,0,Hz,Hz,,
-0,energy,poly,1,Gev,Mev,,
+0,energy,poly,1,eV,MeV,,
 0,emittance_x,poly,2,m,nm,,
 0,emittance_y,poly,3,m,pm,,
 5,b1,pchip,4,m^-2,A,0,200
diff --git a/src/pytac/data/utils/load_mml.m b/src/pytac/data/utils/load_mml.m
@@ -43,7 +43,7 @@ function load_mml(ringmode)
     ao = getao();
 
     % Hard-coded beam energy value.
-    fprintf(f_simple_devices, '0,energy,3e9,True\n');
+    fprintf(f_simple_devices, '0,energy,3000,True\n');
 
     % The individual BPM PVs are not stored in middlelayer.
     BPMS = get_bpm_pvs(ao);
diff --git a/src/pytac/data/utils/load_unitconv.m b/src/pytac/data/utils/load_unitconv.m
@@ -48,9 +48,9 @@ function load_unitconv(ringmode, renamedIndexes)
 % Unit conversions for lattice fields
 % the conversion limits are '' as these fields don't have a Setpoint field
 uc_id = uc_id + 1;
-fprintf(f_units, '%d,%s,poly,%d,%s,%s,%s,%s\n', 0, 'energy', uc_id, 'Gev', 'Mev', '', '');
+fprintf(f_units, '%d,%s,poly,%d,%s,%s,%s,%s\n', 0, 'energy', uc_id, 'eV', 'MeV', '', '');
 fprintf(f_poly, '%d,%d,%f\n', uc_id, 0, 0);
-fprintf(f_poly, '%d,%d,%g\n', uc_id, 1, 1e-6);
+fprintf(f_poly, '%d,%d,%g\n', uc_id, 1, 1e6);
 uc_id = uc_id + 1;
 fprintf(f_units, '%d,%s,poly,%d,%s,%s,%s,%s\n', 0, 'emittance_x', uc_id, 'm', 'nm', '', '');
 fprintf(f_poly, '%d,%d,%f\n', uc_id, 0, 0);
diff --git a/src/pytac/load_csv.py b/src/pytac/load_csv.py
@@ -167,7 +167,7 @@ def load_unitconv(mode_dir: Path, lattice: Lattice) -> None:
                 # TODO: This should probably be moved into the .csv files somewhere.
                 rigidity_families = {"hstr", "vstr", "quadrupole", "sextupole", "bend"}
                 if item["uc_type"] != "null" and element._families & rigidity_families:
-                    energy = lattice.get_value("energy", units=pytac.PHYS)
+                    energy = lattice.get_value("energy", units=pytac.ENG)
                     uc.set_post_eng_to_phys(utils.get_div_rigidity(energy))
                     uc.set_pre_phys_to_eng(utils.get_mult_rigidity(energy))
                 element.set_unitconv(item["field"], uc)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`el_id,field,value,readonly`
`2`		`-0,energy,3000000000,True`
	`2`	`+0,energy,3000,True`