Changeset 13224 for trunk/FACT++
- Timestamp:
- 03/26/12 08:48:53 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/FACT++/src/feedback.cc
r13178 r13224 124 124 125 125 uint16_t fCurrentRequestInterval; 126 uint16_t fNumCalibIgnore; 127 uint16_t fNumCalibRequests; 126 128 127 129 bool fOutputEnabled; … … 250 252 return; 251 253 252 if (fCursorCur< 100)254 if (fCursorCur<fNumCalibRequests) 253 255 { 254 256 if (fStatusBias.second==BIAS::kVoltageOn) … … 271 273 fOutputEnabled = false; 272 274 fControlType = kIdle; 275 276 Info("Calibration successfully done."); 273 277 274 278 if (fStatusBias.second==BIAS::kVoltageOn) … … 921 925 fBiasOffset = -2; 922 926 fControlType = kTemp; 923 fCursorCur = -10; 924 fCursorTemp = 0; 927 fCursorCur = -fNumCalibIgnore; 925 928 fCursorTemp = 0; 926 929 fCurrentsAvg.assign(BIAS::kNumChannels, 0); … … 1021 1024 if (fControlType==kTemp) 1022 1025 { 1023 if (GetCurrentState()==kStateCalibrating && fCursorCur< 100)1026 if (GetCurrentState()==kStateCalibrating && fCursorCur<fNumCalibRequests) 1024 1027 return GetCurrentState(); 1025 1028 … … 1075 1078 fKp(0), fKi(0), fKd(0), fT(-1), 1076 1079 fCurrentRequestInterval(0), 1080 fNumCalibIgnore(30), 1081 fNumCalibRequests(300), 1077 1082 fOutputEnabled(false) 1078 1083 { … … 1232 1237 1233 1238 fCurrentRequestInterval = conf.Get<uint16_t>("current-request-interval"); 1239 fNumCalibIgnore = conf.Get<uint16_t>("num-calib-ignore"); 1240 fNumCalibRequest = conf.Get<uint16_t>("num-calib-average"); 1234 1241 1235 1242 return -1; … … 1253 1260 ("pixel-map-file", var<string>("FACTmapV5a.txt"), "Pixel mapping file. Used here to get the default reference voltage.") 1254 1261 ("current-request-interval", var<uint16_t>(1000), "Interval between two current requests.") 1262 ("num-calib-ignore", var<uint16_t>(30), "Number of current requests to be ignored before averaging") 1263 ("num-calib-average", var<uint16_t>(300), "Number of current requests to be averaged") 1255 1264 ; 1256 1265
Note:
See TracChangeset
for help on using the changeset viewer.