Merge pull request #7 from slaclab/zeroOffsets

Zero offsets
slaclab · Aug 22, 2020 · d7ccc1a · d7ccc1a
2 parents 5448b7f + 86d3455
commit d7ccc1a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
@@ -11,6 +11,11 @@
 #               2018, W. Williams        (ernesto)
 #      
 #==============================================================
+R3.2.1:   25-August-2020 J. Mock (jmock)
+    * Remove calls to zeroOffset() in Longitudinal.cc to stop SXR loop from snapping
+        to HXR value when the beam trips off
+    * Also comment out _referenceOffset = 0 in ActuatorDevice.cc::clear() for same reason
+
 R3.2.0:   25-August-2020 R.Reno (rreno)
     * Add ability to select BY1 energy source at IOC startup
     * Fixed bug where error handling code for an FCOM channel creation failure would never run

diff --git a/fastFeedbackApp/src/framework/ActuatorDevice.cc b/fastFeedbackApp/src/framework/ActuatorDevice.cc
@@ -261,7 +261,6 @@ void ActuatorDevice::clear() {
     Device::clear();
     _nextWrite = 0;
     _droppedPoints = 0;
-    _referenceOffset = 0;
     Log::getInstance() << Log::flagOffset << Log::dpInfo
 		       << "ActuatorDevice::clear() _referenceOffset=0"
 		       << Log::dp;

diff --git a/fastFeedbackApp/src/framework/Longitudinal.cc b/fastFeedbackApp/src/framework/Longitudinal.cc
@@ -1170,8 +1170,6 @@ int Longitudinal::selectStates() {
 		_latestMeasurements[0] = 0;
 		_latestMeasurementsSum[0] = 0;
 
-		// Zero actuator offsets!
-		actuatorDevice->zeroOffset();
 	}
 	stateDevice->setUsedBy(stateUsed);
 	actuatorDevice->setUsedBy(stateUsed);
@@ -1251,8 +1249,6 @@ int Longitudinal::selectStates() {
 		_latestMeasurements[1] = 0;
 		_latestMeasurementsSum[1] = 0;
 
-		// Zero actuator offsets!
-		actuatorDevice->zeroOffset();
 	}
 
 	stateDevice->setUsedBy(stateUsed);
@@ -1337,8 +1333,6 @@ int Longitudinal::selectStates() {
 		_latestMeasurements[2] = 0;
 		_latestMeasurementsSum[2] = 0;
 
-		// Zero actuator offsets!
-		actuatorDevice->zeroOffset();
 	}
 	stateDevice->setUsedBy(stateUsed);
 	actuatorDevice->setUsedBy(stateUsed);
@@ -1416,8 +1410,6 @@ int Longitudinal::selectStates() {
 		_latestMeasurements[3] = 0;
 		_latestMeasurementsSum[3] = 0;
 
-		// Zero actuator offsets!
-		actuatorDevice->zeroOffset();
 	}
 	stateDevice->setUsedBy(stateUsed);
 	actuatorDevice->setUsedBy(stateUsed);
@@ -1497,8 +1489,6 @@ int Longitudinal::selectStates() {
 		_latestMeasurements[4] = 0;
 		_latestMeasurementsSum[4] = 0;
 
-		// Zero actuator offsets!
-		actuatorDevice->zeroOffset();
 	}
 	stateDevice->setUsedBy(stateUsed);
 	actuatorDevice->setUsedBy(stateUsed);
@@ -1651,8 +1641,6 @@ int Longitudinal::selectStates() {
 		_latestMeasurements[5] = 0;
 		_latestMeasurementsSum[5] = 0;
 
-		// Zero actuator offsets!
-		actuatorDevice->zeroOffset();
 	}
 	stateDevice->setUsedBy(stateUsed);
 	actuatorDevice->setUsedBy(stateUsed);