Changeset 18607 for trunk

Timestamp:

09/17/16 19:34:55 (8 years ago)

Author:

tbretz

Message:

WORKAROUND CH272: Removed the shortcut channel from the list of treated channels.

File:

• trunk/FACT++/src/feedback.cc (modified) (5 diffs)

trunk/FACT++/src/feedback.cc

@@ -209 +209 @@
 
         // Only the channels which are no spare channels are ramped
-        if (std::count(fBiasDac.begin(), fBiasDac.end(), dac)!=320)
+        // Due to the shortcut, only 319 channels are ramped, so only
+        // 320 and not 319 are expected to have the correct day setting
+        if (std::count(fBiasDac.begin(), fBiasDac.end(), dac)!=319/*320*/)
             return GetCurrentState();
 
@@ -255 +257 @@
             fCurrentsRms.assign(BIAS::kNumChannels, 0);
 
-            Dim::SendCommandNB("BIAS_CONTROL/SET_GLOBAL_DAC", uint16_t(256+512*fCalibStep));
+            // Ramp all channels to the calibration setting except the one
+            // with a shortcut
+            vector<uint16_t> vec(BIAS::kNumChannels, uint16_t(256+512*fCalibStep));
+            vec[272] = 0;
+            Dim::SendCommandNB("BIAS_CONTROL/SET_ALL_CHANNELS_DAC", vec);
+
+            //Dim::SendCommandNB("BIAS_CONTROL/SET_GLOBAL_DAC", uint16_t(256+512*fCalibStep));
 
             return GetCurrentState();
@@ -572 +580 @@
 
             // Check if this is a blocked channel
+            // 272 is the one with the shortcut
             const bool blocked =
                 (fMoonMode>0 && std::find(inner0.begin(), inner0.end(), i)!=inner0.end()) ||
                 (fMoonMode>1 && std::find(inner1.begin(), inner1.end(), i)!=inner1.end()) ||
-                (fMoonMode>2 && std::find(inner2.begin(), inner2.end(), i)!=inner2.end());
+                (fMoonMode>2 && std::find(inner2.begin(), inner2.end(), i)!=inner2.end()) ||
+                i==272;
 
             // Number of G-APDs in this patch
@@ -810 +820 @@
                 vec[263] = vec[262]-fVoltGapd[262]+fVoltGapd[263];
 
+                // Do not ramp the channel with a shortcut
+                vec[272] = 0;
+
 //            if (fDimBias.state()!=BIAS::State::kRamping)
 //            {
@@ -996 +1009 @@
         fTimeCalib = Time();
 
-        Dim::SendCommandNB("BIAS_CONTROL/SET_GLOBAL_DAC", uint16_t(256+512*fCalibStep));
+        // Ramp all channels to the calibration setting except the one
+        // with a shortcut
+        vector<uint16_t> vec(BIAS::kNumChannels, uint16_t(256+512*fCalibStep));
+        vec[272] = 0;
+        Dim::SendCommandNB("BIAS_CONTROL/SET_ALL_CHANNELS_DAC", vec);
+
+        //Dim::SendCommandNB("BIAS_CONTROL/SET_GLOBAL_DAC", uint16_t(256+512*fCalibStep));
 
         return Feedback::State::kCalibrating;