diff --git a/bam/baseconfig.py b/bam/baseconfig.py index b8daeb005cd6799d557d940bab23c4413ed615d2..07ff27fd54c78c9ce52799d3b4e41b340528821f 100644 --- a/bam/baseconfig.py +++ b/bam/baseconfig.py @@ -40,6 +40,8 @@ SDM_REVISION = 'r3992' ZERO_CROSSINGS = 3 +feedbackIntegrationTicks = 10 + # A Motor is either: # * Not connected: None # * A pair of integers (a,b) with a being the MD22 controller, b the diff --git a/bam/settings/00-FLASH.py b/bam/settings/00-FLASH.py index ae7dc78915b37d8ce27bb810ca658787721f3e24..77ad9ef85fc29b12b5a76687f61be9258f22a550 100644 --- a/bam/settings/00-FLASH.py +++ b/bam/settings/00-FLASH.py @@ -1,4 +1,5 @@ if ACCELERATOR == 'FLASH': + feedbackIntegrationTicks = 50 classifier = "flash" if STATION == 'FL0.DBC1': MOTOR_DEVNO='unis8' diff --git a/bam/templates/bam_base_config.xml b/bam/templates/bam_base_config.xml index 509ecb317ea20525c6e362e951e867e4bec79235..928d5896cd2799b8d5b0ddfba8efb513f70a33c3 100644 --- a/bam/templates/bam_base_config.xml +++ b/bam/templates/bam_base_config.xml @@ -94,6 +94,6 @@ except KeyError: <variable name="nSamplesCompact" type="uint32" value="1000" /> <variable name="nZeroCrossings" type="uint32" value="${ZERO_CROSSINGS}" /> <variable name="toroidCompaction" type="uint32" value="${toroid_compaction}" /> - <variable name="feedbackIntegrationTicks" type="uint64" value="10" /> + <variable name="feedbackIntegrationTicks" type="uint64" value="${feedbackIntegrationTicks}" /> </module> </configuration>