From cfb976d81361c942af11ae7a5cc256288aa06c8c Mon Sep 17 00:00:00 2001
From: Jerzy Jamroz <jerzy.jamroz@esss.se>
Date: Tue, 4 Feb 2020 16:47:00 +0100
Subject: [PATCH] Refactoring.
---
README.md | 2 +
init/mevts-ess.json | 86 +++++++++------------------
supercycles/example01.csv | 120 +++++++++++++++++++-------------------
supercycles/example02.csv | 64 ++++++++++----------
4 files changed, 120 insertions(+), 152 deletions(-)
diff --git a/README.md b/README.md
index d5fde33..6c015fb 100644
--- a/README.md
+++ b/README.md
@@ -15,3 +15,5 @@ ESS Reference & Lookup Tables
* Description of Modes for ESS Accelerator Operation: ESS-0038258
* $(ESS-0038258->Revision) == $ProtVer
* Beam Configuration: https://confluence.esss.lu.se/display/ABC/Beam+Configuration
+* Master events according to: ESS-1837307: Time Structure of the Proton Beam Pulses in the LINAC.
+
diff --git a/init/mevts-ess.json b/init/mevts-ess.json
index 68c9809..83ee9e6 100644
--- a/init/mevts-ess.json
+++ b/init/mevts-ess.json
@@ -1,63 +1,29 @@
{
- "doc": "ESS-1837307",
- "MEVT1": {
- "LEBTC_ST": {
- "id": 6
- }
- },
- "MEVT2": {
- "LEBTC_END": {
- "id": 7
- }
- },
- "MEVT3": {
- "MEBTC_ST": {
- "id": 8
- }
- },
- "MEVT4": {
- "MEBTC_END": {
- "id": 9
- }
- },
- "MEVT5": {
- "IONMAG_ST": {
- "id": 10
- }
- },
- "MEVT6": {
- "IONMAG_END": {
- "id": 11
- }
- },
- "MEVT7": {
- "BPULSE_ST": {
- "id": 12
- }
- },
- "MEVT8": {
- "BPULSE_END": {
- "id": 13
- }
- },
- "MEVT9": {
- "14HZ": {
- "id": 14
- }
- },
- "MEVT10": {
- "BPULSE_CM": {
- "id": 15
- }
- },
- "MEVT11": {
- "DATA": {
- "id": 16
- }
- },
- "MEVT12": {
- "DATAS": {
- "id": 17
- }
+ "LEBTC_ST": {
+ "id": 6
+ },
+ "LEBTC_END": {
+ "id": 7
+ },
+ "MEBTC_ST": {
+ "id": 8
+ },
+ "MEBTC_END": {
+ "id": 9
+ },
+ "IONMAG_ST": {
+ "id": 10
+ },
+ "IONMAG_END": {
+ "id": 11
+ },
+ "BPULSE_ST": {
+ "id": 12
+ },
+ "BPULSE_END": {
+ "id": 13
+ },
+ "BPULSE_CM": {
+ "id": 15
}
}
diff --git a/supercycles/example01.csv b/supercycles/example01.csv
index 3ad5168..d251439 100644
--- a/supercycles/example01.csv
+++ b/supercycles/example01.csv
@@ -1,61 +1,61 @@
Id,PBMod,PBDest,BPULSE_ST,BPULSE_END,PBState,PBLen,PBEn,PBCurr
-1,Conditioning,ISrc,0,50,1,1000,100,100000
-2,Conditioning,LEBT,50,100,1,1001,101,100001
-3,Conditioning,MEBT,100,150,1,1002,102,100002
-4,ProbeBeam,ISrc,150,200,1,1003,103,100003
-5,ProbeBeam,LEBT,200,250,1,1004,104,100004
-6,ProbeBeam,MEBT,250,300,1,1005,105,100005
-7,FastCommissioning,ISrc,300,350,1,1006,106,100006
-8,FastCommissioning,LEBT,350,400,1,1007,107,100007
-9,FastCommissioning,MEBT,400,450,1,1008,108,100008
-10,RfTest,MEBT,450,500,1,1009,109,100009
-11,Conditioning,ISrc,500,550,1,1010,110,100010
-12,Conditioning,LEBT,550,600,1,1011,111,100011
-13,Conditioning,MEBT,600,650,1,1012,112,100012
-14,ProbeBeam,ISrc,650,700,1,1013,113,100013
-15,ProbeBeam,LEBT,700,750,1,1014,114,100014
-16,ProbeBeam,MEBT,750,800,1,1015,115,100015
-17,FastCommissioning,ISrc,800,850,1,1016,116,100016
-18,FastCommissioning,LEBT,850,900,1,1017,117,100017
-19,FastCommissioning,MEBT,900,950,1,1018,118,100018
-20,RfTest,MEBT,950,1000,1,1019,119,100019
-21,Conditioning,ISrc,1000,1050,1,1020,120,100020
-22,Conditioning,LEBT,1050,1100,1,1021,121,100021
-23,Conditioning,MEBT,1100,1150,1,1022,122,100022
-24,ProbeBeam,ISrc,1150,1200,1,1023,123,100023
-25,ProbeBeam,LEBT,1200,1250,1,1024,124,100024
-26,ProbeBeam,MEBT,1250,1300,1,1025,125,100025
-27,FastCommissioning,ISrc,1300,1350,1,1026,126,100026
-28,FastCommissioning,LEBT,1350,1400,1,1027,127,100027
-29,FastCommissioning,MEBT,1400,1450,1,1028,128,100028
-30,RfTest,MEBT,1450,1500,1,1029,129,100029
-31,Conditioning,ISrc,1500,1550,1,1030,130,100030
-32,Conditioning,LEBT,1550,1600,1,1031,131,100031
-33,Conditioning,MEBT,1600,1650,1,1032,132,100032
-34,ProbeBeam,ISrc,1650,1700,1,1033,133,100033
-35,ProbeBeam,LEBT,1700,1750,1,1034,134,100034
-36,ProbeBeam,MEBT,1750,1800,1,1035,135,100035
-37,FastCommissioning,ISrc,1800,1850,1,1036,136,100036
-38,FastCommissioning,LEBT,1850,1900,1,1037,137,100037
-39,FastCommissioning,MEBT,1900,1950,1,1038,138,100038
-40,RfTest,MEBT,1950,2000,1,1039,139,100039
-41,Conditioning,ISrc,2000,2050,1,1040,140,100040
-42,Conditioning,LEBT,2050,2100,2,1041,141,100041
-43,Conditioning,MEBT,2100,2150,2,1042,142,100042
-44,ProbeBeam,ISrc,2150,2200,2,1043,143,100043
-45,ProbeBeam,LEBT,2200,2250,2,1044,144,100044
-46,ProbeBeam,MEBT,2250,2300,2,1045,145,100045
-47,FastCommissioning,ISrc,2300,2350,2,1046,146,100046
-48,FastCommissioning,LEBT,2350,2400,2,1047,147,100047
-49,FastCommissioning,MEBT,2400,2450,2,1048,148,100048
-50,RfTest,MEBT,2450,2500,2,1049,149,100049
-51,Conditioning,ISrc,2500,2550,2,1050,150,100050
-52,Conditioning,LEBT,2550,2600,2,1051,151,100051
-53,Conditioning,MEBT,2600,2650,2,1052,152,100052
-54,ProbeBeam,ISrc,2650,2700,2,1053,153,100053
-55,ProbeBeam,LEBT,2700,2750,2,1054,154,100054
-56,ProbeBeam,MEBT,2750,2800,2,1055,155,100055
-57,FastCommissioning,ISrc,2800,2850,2,1056,156,100056
-58,FastCommissioning,LEBT,2850,2900,2,1057,157,100057
-59,FastCommissioning,MEBT,2900,2950,2,1058,158,100058
-60,RfTest,MEBT,2950,3000,2,1059,159,100059
+1,Conditioning,ISrc,0,50,On,1000,100,100000
+2,Conditioning,LEBT,50,100,On,1001,101,100001
+3,Conditioning,MEBT,100,150,On,1002,102,100002
+4,ProbeBeam,ISrc,150,200,Off,1003,103,100003
+5,ProbeBeam,LEBT,200,250,Off,1004,104,100004
+6,ProbeBeam,MEBT,250,300,Off,1005,105,100005
+7,FastCommissioning,ISrc,300,350,Off,1006,106,100006
+8,FastCommissioning,LEBT,350,400,On,1007,107,100007
+9,FastCommissioning,MEBT,400,450,On,1008,108,100008
+10,RfTest,MEBT,450,500,On,1009,109,100009
+11,Conditioning,ISrc,500,550,Off,1010,110,100010
+12,Conditioning,LEBT,550,600,Off,1011,111,100011
+13,Conditioning,MEBT,600,650,Off,1012,112,100012
+14,ProbeBeam,ISrc,650,700,Off,1013,113,100013
+15,ProbeBeam,LEBT,700,750,On,1014,114,100014
+16,ProbeBeam,MEBT,750,800,On,1015,115,100015
+17,FastCommissioning,ISrc,800,850,On,1016,116,100016
+18,FastCommissioning,LEBT,850,900,Off,1017,117,100017
+19,FastCommissioning,MEBT,900,950,Off,1018,118,100018
+20,RfTest,MEBT,950,1000,Off,1019,119,100019
+21,Conditioning,ISrc,1000,1050,Off,1020,120,100020
+22,Conditioning,LEBT,1050,1100,On,1021,121,100021
+23,Conditioning,MEBT,1100,1150,On,1022,122,100022
+24,ProbeBeam,ISrc,1150,1200,On,1023,123,100023
+25,ProbeBeam,LEBT,1200,1250,Off,1024,124,100024
+26,ProbeBeam,MEBT,1250,1300,Off,1025,125,100025
+27,FastCommissioning,ISrc,1300,1350,Off,1026,126,100026
+28,FastCommissioning,LEBT,1350,1400,Off,1027,127,100027
+29,FastCommissioning,MEBT,1400,1450,On,1028,128,100028
+30,RfTest,MEBT,1450,1500,On,1029,129,100029
+31,Conditioning,ISrc,1500,1550,On,1030,130,100030
+32,Conditioning,LEBT,1550,1600,Off,1031,131,100031
+33,Conditioning,MEBT,1600,1650,On,1032,132,100032
+34,ProbeBeam,ISrc,1650,1700,On,1033,133,100033
+35,ProbeBeam,LEBT,1700,1750,On,1034,134,100034
+36,ProbeBeam,MEBT,1750,1800,Off,1035,135,100035
+37,FastCommissioning,ISrc,1800,1850,Off,1036,136,100036
+38,FastCommissioning,LEBT,1850,1900,Off,1037,137,100037
+39,FastCommissioning,MEBT,1900,1950,Off,1038,138,100038
+40,RfTest,MEBT,1950,2000,On,1039,139,100039
+41,Conditioning,ISrc,2000,2050,On,1040,140,100040
+42,Conditioning,LEBT,2050,2100,On,1041,141,100041
+43,Conditioning,MEBT,2100,2150,Off,1042,142,100042
+44,ProbeBeam,ISrc,2150,2200,Off,1043,143,100043
+45,ProbeBeam,LEBT,2200,2250,Off,1044,144,100044
+46,ProbeBeam,MEBT,2250,2300,Off,1045,145,100045
+47,FastCommissioning,ISrc,2300,2350,On,1046,146,100046
+48,FastCommissioning,LEBT,2350,2400,On,1047,147,100047
+49,FastCommissioning,MEBT,2400,2450,On,1048,148,100048
+50,RfTest,MEBT,2450,2500,Off,1049,149,100049
+51,Conditioning,ISrc,2500,2550,Off,1050,150,100050
+52,Conditioning,LEBT,2550,2600,Off,1051,151,100051
+53,Conditioning,MEBT,2600,2650,Off,1052,152,100052
+54,ProbeBeam,ISrc,2650,2700,On,1053,153,100053
+55,ProbeBeam,LEBT,2700,2750,On,1054,154,100054
+56,ProbeBeam,MEBT,2750,2800,On,1055,155,100055
+57,FastCommissioning,ISrc,2800,2850,Off,1056,156,100056
+58,FastCommissioning,LEBT,2850,2900,Off,1057,157,100057
+59,FastCommissioning,MEBT,2900,2950,Off,1058,158,100058
+60,RfTest,MEBT,2950,3000,Off,1059,159,100059
diff --git a/supercycles/example02.csv b/supercycles/example02.csv
index 006ac7a..0f413f5 100644
--- a/supercycles/example02.csv
+++ b/supercycles/example02.csv
@@ -1,33 +1,33 @@
Id,PBMod,PBDest,BPULSE_ST,BPULSE_END,PBState,PBLen,PBEn,PBCurr
-1,Conditioning,ISrc,0,5,1,1000,100,100000
-2,Conditioning,LEBT,0,50,1,1001,101,100001
-3,Conditioning,MEBT,0,100,1,1002,102,100002
-4,ProbeBeam,ISrc,0,200,1,1003,103,100003
-5,ProbeBeam,LEBT,0,300,1,1004,104,100004
-6,ProbeBeam,MEBT,0,400,1,1005,105,100005
-7,FastCommissioning,ISrc,0,500,1,1006,106,100006
-8,FastCommissioning,LEBT,0,600,1,1007,107,100007
-9,FastCommissioning,MEBT,0,700,1,1008,108,100008
-10,RfTest,MEBT,0,800,1,1009,109,100009
-11,Conditioning,ISrc,0,900,1,1010,110,100010
-12,Conditioning,LEBT,0,1000,1,1011,111,100011
-13,Conditioning,MEBT,0,1100,1,1012,112,100012
-14,ProbeBeam,ISrc,0,1200,1,1013,113,100013
-15,ProbeBeam,LEBT,0,1300,1,1014,114,100014
-16,ProbeBeam,MEBT,0,1400,1,1015,115,100015
-17,FastCommissioning,ISrc,0,1500,1,1016,116,100016
-18,FastCommissioning,LEBT,0,1600,1,1017,117,100017
-19,FastCommissioning,MEBT,0,1700,1,1018,118,100018
-20,RfTest,MEBT,0,1800,1,1019,119,100019
-21,Conditioning,ISrc,0,1900,1,1020,120,100020
-22,Conditioning,LEBT,0,2000,1,1021,121,100021
-23,Conditioning,MEBT,0,2100,1,1022,122,100022
-24,ProbeBeam,ISrc,0,2200,1,1023,123,100023
-25,ProbeBeam,LEBT,0,2300,1,1024,124,100024
-26,ProbeBeam,MEBT,0,2400,1,1025,125,100025
-27,FastCommissioning,ISrc,0,2500,1,1026,126,100026
-28,FastCommissioning,LEBT,0,2600,1,1027,127,100027
-29,FastCommissioning,MEBT,0,2700,1,1028,128,100028
-30,RfTest,MEBT,0,2800,1,1029,129,100029
-31,Conditioning,ISrc,0,2900,1,1030,130,100030
-32,Conditioning,LEBT,0,3000,1,1031,131,100031
+1,Conditioning,ISrc,0,5,On,1000,100,100000
+2,Conditioning,LEBT,0,50,On,1001,101,100001
+3,Conditioning,MEBT,0,100,On,1002,102,100002
+4,ProbeBeam,ISrc,0,200,Off,1003,103,100003
+5,ProbeBeam,LEBT,0,300,Off,1004,104,100004
+6,ProbeBeam,MEBT,0,400,Off,1005,105,100005
+7,FastCommissioning,ISrc,0,500,Off,1006,106,100006
+8,FastCommissioning,LEBT,0,600,On,1007,107,100007
+9,FastCommissioning,MEBT,0,700,On,1008,108,100008
+10,RfTest,MEBT,0,800,On,1009,109,100009
+11,Conditioning,ISrc,0,900,Off,1010,110,100010
+12,Conditioning,LEBT,0,1000,Off,1011,111,100011
+13,Conditioning,MEBT,0,1100,Off,1012,112,100012
+14,ProbeBeam,ISrc,0,1200,Off,1013,113,100013
+15,ProbeBeam,LEBT,0,1300,On,1014,114,100014
+16,ProbeBeam,MEBT,0,1400,On,1015,115,100015
+17,FastCommissioning,ISrc,0,1500,On,1016,116,100016
+18,FastCommissioning,LEBT,0,1600,Off,1017,117,100017
+19,FastCommissioning,MEBT,0,1700,Off,1018,118,100018
+20,RfTest,MEBT,0,1800,Off,1019,119,100019
+21,Conditioning,ISrc,0,1900,Off,1020,120,100020
+22,Conditioning,LEBT,0,2000,On,1021,121,100021
+23,Conditioning,MEBT,0,2100,On,1022,122,100022
+24,ProbeBeam,ISrc,0,2200,On,1023,123,100023
+25,ProbeBeam,LEBT,0,2300,Off,1024,124,100024
+26,ProbeBeam,MEBT,0,2400,Off,1025,125,100025
+27,FastCommissioning,ISrc,0,2500,Off,1026,126,100026
+28,FastCommissioning,LEBT,0,2600,Off,1027,127,100027
+29,FastCommissioning,MEBT,0,2700,On,1028,128,100028
+30,RfTest,MEBT,0,2800,On,1029,129,100029
+31,Conditioning,ISrc,0,2900,On,1030,130,100030
+32,Conditioning,LEBT,0,3000,Off,1031,131,100031
--
GitLab