***
Wartungsfenster jeden ersten Mittwoch vormittag im Monat
***
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ADwin
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Quantuminfo
Experiment Control
ADwin
Graph
aec49db864858a8a73d330938cf0756e492033c9
Select Git revision
Branches
2
labscript-waits
main
default
protected
2 results
You can move around the graph by using the arrow keys.
Begin with the selected commit
Created with Raphaël 2.2.0
5
Mar
12
Feb
16
Jan
10
Dec
9
6
3
29
Nov
28
13
14
Oct
30
Apr
12
21
Nov
27
Jul
13
Mar
26
Jan
29
Dec
28
20
16
17
Nov
10
3
2
25
Oct
10
7
4
30
Sep
29
28
27
23
20
Bugfix: waits in labscript work now, sync with TiCos after wait not optimized yet.
labscript-waits
labscript-waits
labscript waits: Do not save AIN values during wait (then we don't have a problem for sure if the wait takes very long).
First untested code for labscript waits:
Merge branch 'PID_improvement' into 'main'
main
main
Fix PID turnoff when last output value should not be saved. Bugfix was not save with output limits.
Moved calculating new output values to after setting AOUT modules. Write to DAC at very end of EVENT. Set PID gains and limits only once during init, because that took too much time during the cycle.
TiCo: Added 500ns delay for better sync with AOUT channels
Improved sync between DO and AO channels
Removed remiaing code from AIN storage rate from ADwin code (we don't use that anymore because of higher workoad)
Added Start values for PID control
Revert "When PID is enabled, don't use the I value from previous one, that seems to enhance overshoots (added that in April, not sure anymore why)"
Added Trigger with rising edge at start of experiment for oscilloscope
When PID is enabled, don't use the I value from previous one, that seems to enhance overshoots (added that in April, not sure anymore why)
Enhanced turn-off of PID controls
Disabled storage rate for analog input becasue of high workload
Removed resetting pid_sum when PID is turned on (at beginning they are initialized as 0 already, and when we update the PID parameters or turn it off and on again, this does not reset the last values).
Fixed ADwin AIN storage rate (see also leolab_devices)
Improve setting AOUT values at start and end of run (do not set to zero at end).
Implemented acquisition rate for ADwin AnalogIn
Set DIO channels as outputs in manual mode processes (otherwise DO channels do not work after ADwin poweroff in manual mode until after first shot).
Changed startup delay of first DIO module (calibration).
Merge branch 'change_ain_sorting' into 'main'
Added sorting of AIN array
Removed unused (commented) code
Removed second limit check in PID loop
Changed if block in manual processes
Formatting for readability of manual processes
Make comment headers better readable
Added new variables for README
Small changes (added again total_workload and removed unnecessary initialization)
Changed compiler optimization
Changed manual process w/o PIDs to match new variables
Changes from Daniel Dux: Added PID controls in manual process
Changes from Daniel Dux: Set PID parameters and limits from labscript
Added gitignore for complied and backup files
Added calculating average workload during the shot.
Test PID with AOM and Photodiode
Decreased MAX_EVENTS (for caching/performance reasons), moved initial pid_sum calculation
Fixed workload issue with two addition time variables, set DIO output at t=0, use for loop for AOut channels (PIDs) --> Loop might be removed again!
Fix ploblem with changed output after end of shot due to <= in TiCo process.
Loading