Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • joaopaulomartins/reftabs
  • arekgorzawski/reftabs
  • benjaminbertrand/reftabs
  • beam-diagnostics/reftabs
  • hwcore/reftabs
5 results
Show changes
Commits on Source (205)
Showing
with 478 additions and 188 deletions
.DS_Store
.vscode
---
stages:
- check
- deploy
td-m_deploy-reftabs:
stage: deploy
tags:
- docker
image: registry.esss.lu.se/ics-docker/tower-cli
script:
- >
tower-cli job launch
-h torn.tn.esss.lu.se
-t ${TOWER_OAUTH_TOKEN}
-J deploy-supercycles-reftabs
-e "supercycles_reftabs_version=master"
--monitor
--limit td-m-mtca-ioc1.tn.esss.lu.se
only:
- master@hwcore/reftabs
tdl_deploy-reftabs:
stage: deploy
tags:
- docker
image: registry.esss.lu.se/ics-docker/tower-cli
script:
- >
tower-cli job launch
-h torn.tn.esss.lu.se
-t ${TOWER_OAUTH_TOKEN}
-J deploy-supercycles-reftabs
-e "supercycles_reftabs_version=master"
--monitor
--limit !td-m-mtca-ioc1.tn.esss.lu.se
only:
- master@hwcore/reftabs
allow_failure: true
b02-tdc-tdl-reftabs:
stage: deploy
tags:
- docker
image: registry.esss.lu.se/ics-docker/tower-cli
script:
- >
tower-cli job launch
-h torn.tn.esss.lu.se
-t ${TOWER_OAUTH_TOKEN}
-J deploy-supercycles-reftabs
-e "supercycles_reftabs_version=master"
--monitor
--limit b02-tdc-tdl-cpu-1.cslab.esss.lu.se
when: manual
# Owner distribution:
* @arekgorzawski @jerzyjamroz @javiercereijogarcia @gabrielfedel @fayechicken
*.md @stefanopavinato @annikanordt @stephanegabourin
*.yml @andersharrisson
sceconfig-ess.yml @supercycleengine @jerzyjamroz
*.csv @supercycleengine @emanuelelaface
Are you opening a **BUG REPORT** or a **FEATURE REQUEST**?
# CHANGELOG
Please add a description of your change with the relevant tags, it will be automatically prepended to the `CHANGELOG.md` file:
- feat: A new feature.
- fix: A bug fix.
- docs: Documentation only changes.
- style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc).
- refactor: A code change that neither fixes a bug nor adds a feature.
- perf: A code change that improves performance.
- test: Adding missing tests.
- chore: Changes to the build process or auxiliary tools and libraries such as documentation generation.
# Changelog
All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
## [1.7.0](https://gitlab.esss.lu.se/icshwi/reftabs/tags/1.7.0) - 2020-12-16
<small>[Compare with 1.6.1](https://gitlab.esss.lu.se/icshwi/reftabs/compare/1.6.1...1.7.0)</small>
### Added
- Add .gitlab-ci.yml to deploy reftabs ([c5927f2](https://gitlab.esss.lu.se/icshwi/reftabs/commit/c5927f2451c4ae5b1559ca9854b537514be9fadf) by Benjamin Bertrand).
### Fixed
- Fix: 2hz instead of 1hz ([faf1163](https://gitlab.esss.lu.se/icshwi/reftabs/commit/faf11634cc277d371e6c5626ce82b8d0c92b1889) by Jerzy Jamroz).
- Fix: fbis meeting agreements added ([7858e8b](https://gitlab.esss.lu.se/icshwi/reftabs/commit/7858e8b2ba0c648773182f1cd4577a3ee64f3a85) by Jerzy Jamroz).
- Fix: pbstate without fault and recovery ([5a4a20d](https://gitlab.esss.lu.se/icshwi/reftabs/commit/5a4a20dc84418e6834d81397dac3b206789d0a23) by Jerzy Jamroz).
- Fix: event names - update ([d722748](https://gitlab.esss.lu.se/icshwi/reftabs/commit/d7227482486428a127813a57adf97a33701b8739) by Jerzy Jamroz).
- Fix pipeline ([aa2ae1a](https://gitlab.esss.lu.se/icshwi/reftabs/commit/aa2ae1a4868b1630af8d7e80b3d7eb1f30929388) by Benjamin Bertrand).
- Fix: branch refers with bvx.x.x to the tag number. ([30dea3f](https://gitlab.esss.lu.se/icshwi/reftabs/commit/30dea3f0d47ea1bd7d7d894a6e08932d9577de47) by jerzyjamroz).
## [1.6.1](https://gitlab.esss.lu.se/icshwi/reftabs/tags/1.6.1) - 2020-04-09
<small>[Compare with first commit](https://gitlab.esss.lu.se/icshwi/reftabs/compare/09667be334d6427694955b167524b5d3470eabcc...1.6.1)</small>
### Fixed
- Fix: dtl1 is removed from ncl set because dtl2fc is sufficient. ([e0d2237](https://gitlab.esss.lu.se/icshwi/reftabs/commit/e0d2237ca165fb9742ca29326ad69211910e3cf7) by Jerzy Jamroz).
- Fix: pbdest refers to table 8 of ess-0038258 revision 6. ([cfd6d53](https://gitlab.esss.lu.se/icshwi/reftabs/commit/cfd6d536d62458312f24afe297e67adf69bcc3ab) by Jerzy Jamroz).
- Fix: pbmod updated according to table 5 of ess-0038258 revision 6. ([b983db6](https://gitlab.esss.lu.se/icshwi/reftabs/commit/b983db613130ceb9ced11bd6bca6f279dc99ec8b) by Jerzy Jamroz).
......@@ -2,17 +2,22 @@
----
- [ Project Directory Structure ](#Directory)
- [ Tag Versioning ](#Tag)
## Table of Contents
- [Workflow](#Workflow)
- [Project Directory Structure](#Directory)
----
## Workflow <a name="Workflow"></a>
## Project Directory Structure
<a name="Directory"></a>
[![pipeline status](https://gitlab.esss.lu.se/hwcore/reftabs/badges/master/pipeline.svg)](https://gitlab.esss.lu.se/hwcore/reftabs/-/commits/master) `The "master" branch is mirrored into the timing master (TD-M).`
## Project Directory Structure <a name="Directory"></a>
### [init](init)
It loads during the initialization and contains ESS constant variables and enumerations for:
- [databuffer-ess](init/databuffer-ess.json) proton beam modes, destination and state according to ESS-0038258 (_Description of Modes for ESS Accelerator Operation_)
- [mevts-ess](init/mevts-ess.json) - master events according to: ESS-1837307 (_Time Structure of the Proton Beam Pulses in the LINAC_).
......@@ -21,7 +26,7 @@ See [Beam Configuration](https://confluence.esss.lu.se/display/ABC/Beam+Configur
### [supercycles](supercycles)
It loads upon the selection by an ESS operator (see the [manual](https://confluence.esss.lu.se/display/HAR/Supecycle)). The dynamic routines/cycles (runtime).
It loads upon the selection by an ESS operator (see the [manual](supecycles/README.md)). The dynamic routines/cycles (runtime).
### [tools](tools)
......@@ -30,17 +35,3 @@ Productivity enhancements.
### [doc](doc)
Other documents, manuals, references and drafts.
## Tag Versioning
<a name="Tag"></a>
- MAJOR (1st digit) == {Backward compatibility mark}
- MINOR (2sd digit) == {ESS-0038258 Chess Revision, ProtNum}
- PATH (3rd digit) == {ESS-1837307 Chess Revision, ProtVer}
- BUILD (4th digit) == {supercycle adds, bug corrections}
e.g. 1.5.1+1 means:
- all with 1 is compatible,
- ProtNum == 5, ESS-0038258 revision == 5,
- ProtVer == 1, ESS-1837307 revistion == 1,
- +1 - some files were introduced, e.g. supercycle tables.
File deleted
## Complementary Documentation
* [Timing Data Model Specification](https://confluence.esss.lu.se/display/HAR/Timing+Data+Model+Specification)
\ No newline at end of file
* [Timing Data Model Specification](https://confluence.esss.lu.se/display/HAR/Timing+Data+Model+Specification)
* [State Machine for ESS](StateMachineESS.md)
* [Allowed combinations of beam modes and insertable devices](https://chess.esss.lu.se/enovia/link/ESS-0377547/21308.51166.38912.2677/valid)
* [Timing Operator OPI](https://chess.esss.lu.se/enovia/link/ESS-2162066/21308.51166.48128.29321/valid)
State Machine
---
# Beam OFF/ Beam ON – Button and functionality
## Timing OPI is used to request Beam OFF (by using beam off/on button) and then:
* TS stops sending triggers to magnetron PS
* TS distributes beam present = OFF
* TS distributes Beam OFF
## Timing OPI is used to request Beam ON (by using beam off/on button) and then:
* TS starts sending triggers to magnetron PS
* TS distributes beam present = ON
* TS distributes Beam ON
## Beam Mode “No beam” is selected:
* TS stops sending triggers to magnetron PS
* TS distributes beam present = OFF
* TS distributes beam mode
# FBIS enters Beam Inhibit State –
1. FBIS stops beam by triggering the Beam Switch off Actuators
2. FBIS sends “TDS Interlock Trigger Request” to TS to stop Magnetron triggers (through DLN backplane to EVR) (Considered as BPCS - Secondary Beam Shut off Path in FBIS)
3. TS stops sending triggers to magnetron PS
4. TS distributes beam present = OFF to all systems
5. FBIS leaves Beam Inhibit State (Automatic) –
6. FBIS removes signal “TDS Interlock Trigger Request” to TS to stop Magnetron triggers through DLN backplane
7. TS automatically starts sending triggers to magnetron PS
8. TS distributes beam present = ON to everyone
*Note: TS (timing OPI/ beam off button) will request a beam inhibit from FBIS as well, this will happen by TS changing Beam OFF/ON State to Beam OFF. This signal is received by FBIS through sw interlock input (PV is beam OFF and sent by timing IOC).*
# FBIS enters Regular Beam Interlock State or Emergency Beam Interlock State –
1. FBIS stops beam by triggering the Beam Switch off Actuators
2. FBIS sends “TDS Interlock Trigger Request” to TS to stop Magnetron triggers (through DLN backplane to EVR) (Considered as BPCS - Secondary Beam Shut off Path in FBIS)
3. FBIS sends signal “TDS Post Mortem Request” to TS to issue post Mortem trigger (through DLN backplane to EVR)
4. TS sends Post Mortem Trigger to all systems upon receiving (“TDS Post Mortem Request”)
5. TS stops sending triggers to magnetron PS
6. TS distributes beam present = OFF to all systems
7. FBIS is Reset by the operator -> FBIS leaves Beam Interlock State –
8. FBIS removes signal “TDS Interlock Trigger Request” to TS to stop Magnetron triggers through DLN backplane
9. TS automatically starts sending triggers to magnetron PS
10. TS distributes beam present = ON to everyone
---
MEBT-010:
PwrC-PSChop-001N:
Duration: 20us
FBS: ESS.ACC.W02.W01.R02.TA02
PwrC-PSChop-001P:
Duration: 20us
FBS: ESS.ACC.W02.W01.R02.TA03
# Init Tables
----
# Introduction
Tables to initialize settings around different tools.
# Major changes
## BState
Removed states from the databuffer.
```yaml
BState:
Fault:
id: 30
description: "Fault detected, no proton beam."
Recovery:
id: 40
description: "Recovering from a fault, proton beam for tune up. Possible neutron production, but not intended for users."
```
# Obsolence
The following files will not be falid anymore after the upade in 2024.
* databuffer-ess.yml
* sceconfig-ess.yml
{
"doc": "ESS-0038258",
"AccOp": {
"None": {
"id": 0,
"description": "No Beam"
},
"Shutdown": {
"id": 10,
"description": "Ion source (plasma and HV) and most of the components off, only non-hazardous systems could remain “on”. Tunnel access is possible."
},
"PlasmaConditioning": {
"id": 20,
"description": "Ion Source plasma on, HV off (no beam extraction), no other RF system allowed. Tunnel access is possible."
},
"RFConditioning": {
"id": 30,
"description": "Some or all of the RF systems (RF sources, waveguides, cavities) could be on, as well as plasma conditioning in the ISrc, but no proton production (HV extraction off). Tunnel to be searched and locked."
},
"StudiesDump": {
"id": 40,
"description": "P-beam on, send to the Tuning dump; requires the Tunnel to be searched and locked. Access to the Line-of-Sight (LoS) instruments possible only if primary shutters are closed."
},
"StudiesTarget": {
"id": 50,
"description": "P-beam on, to the Target. Target areas searched and Locked and Tunnel searched and locked;. No access to the LoS instruments."
},
"StartUpTargetTest": {
"id": 60,
"description": "P-beam on, to the Target. Target areas searched and Locked and Tunnel searched and locked;. No access to the LoS instruments."
},
"StartUpLowPower": {
"id": 70,
"description": "P-beam on, to the target; Target areas searched and Locked and Tunnel searched and locked; no access to the LoS instruments."
},
"StartUpRamping": {
"id": 80,
"description": "P-beam on, to the target; Target areas searched and Locked and Tunnel searched and locked; no access to the LoS instruments."
},
"Production": {
"id": 90,
"description": "P-beam on, to the target; Target areas searched and Locked tunnel searched and locked; no access to the LoS instruments. Neutron production for NSS experiments."
}
}
}
doc: ESS-0038258
AccOp:
- None:
id: 0
description: "No Beam"
- Shutdown:
id: 10
description: "Ion source (plasma and HV) and most of the components off, only non-hazardous systems could remain “on”. Tunnel access is possible."
- PlasmaConditioning:
id: 20
description: "Ion Source plasma on, HV off (no beam extraction), no other RF system allowed. Tunnel access is possible."
- RFConditioning:
id: 30
description: "Some or all of the RF systems (RF sources, waveguides, cavities) could be on, as well as plasma conditioning in the ISrc, but no proton production (HV extraction off). Tunnel to be searched and locked."
- StudiesDump:
id: 40
description: "P-beam on, send to the Tuning dump; requires the Tunnel to be searched and locked. Access to the Line-of-Sight (LoS) instruments possible only if primary shutters are closed."
- StudiesTarget:
id: 50
description: "P-beam on, to the Target. Target areas searched and Locked and Tunnel searched and locked;. No access to the LoS instruments."
- StartUpTargetTest:
id: 60
description: "P-beam on, to the Target. Target areas searched and Locked and Tunnel searched and locked;. No access to the LoS instruments."
- StartUpLowPower:
id: 70
description: "P-beam on, to the target; Target areas searched and Locked and Tunnel searched and locked; no access to the LoS instruments."
- StartUpRamping:
id: 80
description: "P-beam on, to the target; Target areas searched and Locked and Tunnel searched and locked; no access to the LoS instruments."
- Production:
id: 90
description: "P-beam on, to the target; Target areas searched and Locked tunnel searched and locked; no access to the LoS instruments. Neutron production for NSS experiments."
doc: ESS-0377547
source: Table 2
desc: Allowed Beam modes vs Destinations for the commissioning up to the DTL1
PBDest:
ISrc:
- NoBeam
- Conditioning
- Probe
- FastCommissioning
- RfTest
- StabilityTest
- SlowCommissioning
- FastTuning
- SlowTuning
LEBT:
- NoBeam
- Conditioning
- Probe
- FastCommissioning
- RfTest
- StabilityTest
- SlowCommissioning
- FastTuning
- SlowTuning
MEBT:
- NoBeam
- Conditioning
- Probe
- FastCommissioning
- RfTest
- SlowCommissioning
- FastTuning
- SlowTuning
DTL2:
- NoBeam
- Conditioning
- Probe
- FastCommissioning
- RfTest
- SlowCommissioning
- FastTuning
doc: ESS-0377547 rev3
source: Table 1
desc: Allowed Beam modes vs Destinations for the commissioning up to the DTL4,
PBDest:
ISrc:
- Conditioning
LEBT:
- NoBeam
- Probe
- FastCommissioning
- RfTest
- StabilityTest
- SlowCommissioning
- FastTuning
- SlowTuning
MEBT:
- NoBeam
- Probe
- FastCommissioning
- RfTest
- SlowCommissioning
- FastTuning
- SlowTuning
DTL2:
- NoBeam
- Probe
- FastCommissioning
- RfTest
- SlowCommissioning
- FastTuning
- SlowTuning
DTL4:
- NoBeam
- Probe
- FastCommissioning
- RfTest
- SlowCommissioning
- FastTuning
- SlowTuning
doc: ESS-0377547 rev5
source: Table 1
desc: Allowed Beam modes vs Destinations for the commissioning up to the DumpLine
PBDest:
Isrc:
- Conditioning
LebtFc:
- NoBeam
- Probe
- FastCommissioning
- RfTest
- StabilityTest
- SlowCommissioning
- FastTuning
- SlowTuning
- LongPulseVerification
- ShieldingVerification
- Production
MebtFc:
- NoBeam
- Probe
- FastCommissioning
- RfTest
- SlowCommissioning
- FastTuning
- SlowTuning
Dtl2Fc:
- NoBeam
- Probe
- FastCommissioning
- RfTest
- SlowCommissioning
- FastTuning
- SlowTuning
Dtl4Fc:
- NoBeam
- Probe
SpkIbs:
- NoBeam
- Probe
MblIbs:
- NoBeam
- Probe
BeamDump:
- NoBeam
- Probe
- FastCommissioning
- RfTest
- StabilityTest
- SlowCommissioning
- FastTuning
- SlowTuning
- LongPulseVerification
Target:
- NoBeam
doc:
- ESS-0377547
- ESS-0357253
source:
- Table 1
- Table 4
desc:
- Maximum Beam parameter in the beam mode
- ESS Operational Limits and Conditions
units:
BCurr: mA
BLen: us
BFreq: Hz
IntCharge : uC
AvgCurrent : uA
NoBeam:
BCurr: 0
BLen: 0
BFreq: 0
IntCharge : 0
AvgCurrent : 0
Conditioning:
BCurr: 0
BLen: 0
BFreq: 0
IntCharge : 0
AvgCurrent : 0
Probe:
BCurr: 6
BLen: 5
BFreq: 1
IntCharge : 0.03
AvgCurrent : 0.03
FastCommissioning:
BCurr: 6
BLen: 5
BFreq: 14
IntCharge : 0.03
AvgCurrent : 0.42
RfTest:
BCurr: 6
BLen: 50
BFreq: 1
IntCharge : 0.3
AvgCurrent : 0.3
StabilityTest:
BCurr: 6
BLen: 50
BFreq: 14
IntCharge : 0.3
AvgCurrent : 4.2
SlowCommissioning:
BCurr: 62.5
BLen: 5
BFreq: 1
IntCharge : 0.31
AvgCurrent : 0.31
FastTuning:
BCurr: 62.5
BLen: 5
BFreq: 14
IntCharge : 0.31
AvgCurrent : 4.37
SlowTuning:
BCurr: 62.5
BLen: 50
BFreq: 1
IntCharge : 3.13
AvgCurrent : 3.13
LongPulseVerification:
BCurr: 62.5
BLen: 2860
BFreq: 0.0333
IntCharge : -1
AvgCurrent : -1
ShieldingVerification:
BCurr: 0
BLen: 0
BFreq: 0
IntCharge : -1
AvgCurrent : -1
Production:
BCurr: 62.5
BLen: 2860
BFreq: 14
IntCharge : -1
AvgCurrent : -1
{
"ProtNum": 6,
"ProtVer": 1,
"PBState": {
"None": {
"id": 0,
"description": "Not Configured"
},
"Off": {
"id": 10,
"description": "No proton beam extraction."
},
"On": {
"id": 20,
"description": "Proton beam (IS on) extraction."
},
"Fault": {
"id": 30,
"description": "Fault detected, no proton beam."
},
"Recovery": {
"id": 40,
"description": "Recovering from a fault, proton beam for tune up. Possible neutron production, but not intended for users."
}
},
"PBMod": {
"None": {
"id": 0,
"description": "Not Configured"
},
"NoBeam": {
"id": 1,
"description": "No Beam"
},
"Conditioning": {
"id": 10,
"description": "Plasma production, magnetron allowed but no extraction HV."
},
"Probe": {
"id": 20,
"description": "First beam through a particular section; non-damaging even in the case of total beam loss (even repeated); used to verify that machine configuration is not grossly incorrect."
},
"FastCommissioning": {
"id": 30,
"description": "Limited beam loading; used for fast scans to rapidly determine/verify RF setpoints."
},
"RfTest": {
"id": 40,
"description": "To perform an initial RF test with a longer pulse."
},
"StabilityTest": {
"id": 50,
"description": "To be used mostly for beam stability test."
},
"SlowCommissioning": {
"id": 60,
"description": "Very short pulse planned to be used used during Normal Conducting Linac commissioning. It would allow installation of the rest of the Linac in parallel to Beam Commissioning."
},
"FastTuning": {
"id": 70,
"description": "Limited beam loading; used for fast scans to rapidly determine/verify RF setpoints and measure beam profiles with wire scanners."
},
"SlowTuning": {
"id": 80,
"description": "Largest charge per pulse that allow operation of invasive proton beam instrumentation devices like wire scanners; long enough beam pulses to diagnose and monitor RF feedback and the onset of beam loading; used to perform more precise single-pulse measurements."
},
"UNDEFINED": {
"id": 254,
"description": "UNDEFINED shall be sent by a system to FBIS when it doesn’t read a value from the Timing.",
"purpose" : "FBIS"
},
"ERROR": {
"id": 255,
"description": "ERROR shall be used internally of the FBIS when there is an error on the decoding (wrong value, failure of CRC check, etc.)",
"purpose" : "FBIS"
}
},
"PBDest": {
"None": {
"id": 0,
"description": "Not Configured"
},
"ISrc": {
"id": 10,
"type": "Virtual destination for plasma conditioning",
"limits": "Only for conditioning mode/0/0/0"
},
"LEBT": {
"id": 20,
"type": "Faraday Cup",
"limits": "Full beam"
},
"MEBT": {
"id": 30,
"type": "Faraday Cup",
"limits": "(1Hz, 50us)/(14Hz, 5us), 62.5 mA"
},
"DTL1": {
"id": 35,
"type": "Faraday Cup"
},
"DTL2": {
"id": 40,
"type": "Faraday Cup",
"limits": "(1Hz, 50us)/(14Hz, 5us), 62.5 mA"
},
"DTL4": {
"id": 50,
"type": "Faraday Cup",
"limits": "(1 Hz, 50us)/(14 Hz, 5us), 62.5 mA"
},
"UNDEFINED": {
"id": 254,
"description": "UNDEFINED shall be sent by a system to FBIS when it doesn’t read a value from the Timing.",
"purpose" : "FBIS"
},
"ERROR": {
"id": 255,
"description": "ERROR shall be used internally of the FBIS when there is an error on the decoding (wrong value, failure of CRC check, etc.)",
"purpose" : "FBIS"
}
}
}
# The references moved to:
BDest: "https://gitlab.esss.lu.se/hwcore/ts/e3-mrfioc2/-/blob/master/template/inc/BDest.inc.template"
BMod: "https://gitlab.esss.lu.se/hwcore/ts/e3-mrfioc2/-/blob/master/template/inc/BMod.inc.template"