Changeset 11362

Timestamp:

07/12/11 17:13:41 (13 years ago)

Author:

ogrimm

Message:

Default voltage allowed for pixel and channel commands

File:

• fact/BIASctrl/User.cc (modified) (3 diffs)

fact/BIASctrl/User.cc

@@ -15 +15 @@
                                                                 const char *Help;
   } CommandList[] = 
-   {{"pixel", &User::cmd_hv, 2, "<pixel id> <volt|default>", "Change bias of pixel"},
-        {"channel", &User::cmd_hv, 2, "<channel range> <v>", "Change bias of (all) channels of active crate"},
+   {{"pixel", &User::cmd_hv, 2, "<pix id> <volt|default>", "Change bias of pixel (to default value)"},
+        {"channel", &User::cmd_hv, 2, "<range> <volt|default>", "Change bias of (all) channels of active crate"},
     {"gs", &User::cmd_gs, 1, "[crate] <volt>", "Global voltage set active crate"},
         {"reset", &User::cmd_reset, 0, "", "Reset active crate"},
@@ -235 +235 @@
   
         // Convert voltage value and check format 
-        if (!ConvertToDouble(Parameter[n+1], &Double)) {
-          if (Match(Parameter[0], "pixel") && Match(Parameter[n+1], "default")) {
-                if (PixelID < DefaultVoltage.size()) Double = DefaultVoltage[PixelID];
-                else Double = 0;
-          }
-          else {
-                PrintMessage("Error: Wrong number format for voltage setting\n");
-                continue;
-          }
+        if (!ConvertToDouble(Parameter[n+1], &Double) && !Match(Parameter[n+1], "default")) {
+          PrintMessage("Error: Wrong number format for voltage setting\n");
+          continue;
         }
 
@@ -252 +246 @@
  
           // Voltage change (number starts with + oder -) ignored if current DAC value is zero
-          if (isdigit(Parameter[n+1][0])==0 && Crates[i]->GetDAC(j) == 0) continue;
+          if ((Parameter[n+1][0]=='+' || Parameter[n+1][0]=='-') && Crates[i]->GetDAC(j) == 0) continue;
+
+          // Should the default value be set?
+          if (Match(Parameter[n+1], "default")) {
+            // Pixel ID given directly or channel number?
+            if (!Match(Parameter[0], "pixel")) {
+              vector<unsigned int> List = PixMap->HV_to_Pixel(i, j/NUM_CHANNELS, j%NUM_CHANNELS);
+              if (!List.empty()) PixelID = List[0];
+              else PixelID = numeric_limits<unsigned int>::max();
+            }
+
+            // Set default voltage
+            if (PixelID < DefaultVoltage.size()) Voltages[i][j] = DefaultVoltage[PixelID];
+            else Voltages[i][j] = 0;
+            continue;
+          }
 
           // Relative or absolute change?