Changeset 11361

Timestamp:

07/12/11 16:39:50 (13 years ago)

Author:

ogrimm

Message:

Default voltages taken from configuration data

Location:

fact/BIASctrl

Files:

• Crate.h (modified) (1 diff)
• History.txt (modified) (1 diff)
• User.cc (modified) (5 diffs)
• User.h (modified) (1 diff)

fact/BIASctrl/Crate.h

@@ -32 +32 @@
         DimService *BiasCurrent;
 
+
         int DAC[MAX_NUM_BOARDS][NUM_CHANNELS];          // Voltage in DAC units
         double Volt[MAX_NUM_BOARDS][NUM_CHANNELS];      // Voltage in Volt
         float Current[MAX_NUM_BOARDS][NUM_CHANNELS];
-
         std::vector<unsigned char> Communicate(std::string);
         void ClearVoltageArrays();

fact/BIASctrl/History.txt

@@ -13 +13 @@
 3/6/2011        Fixed bug in channel addressing from board numbers above 7.
 28/6/2011       Adapted for compilation under ubuntu
+12/7/2011       Default voltages implemented for pixel command.

fact/BIASctrl/User.cc

@@ -15 +15 @@
                                                                 const char *Help;
   } CommandList[] = 
-   {{"pixel", &User::cmd_hv, 2, "<pixel id> <v>", "Change bias of pixel"},
+   {{"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"},
     {"gs", &User::cmd_gs, 1, "[crate] <volt>", "Global voltage set active crate"},
@@ -50 +50 @@
   if (fStatusRefreshRate < MIN_RATE || fStatusRefreshRate > MAX_RATE)  fStatusRefreshRate = 1;
 
+  vector<string> Text = Tokenize(GetConfig("DefaultVoltage", ""), " \t");
+  
+  for (unsigned int i=0; i<Text.size(); i++) {
+        DefaultVoltage.push_back(atof(Text[i].c_str()));
+  }
+
   // Open devices
   for (unsigned int i=0; i<Boards.size(); i++) {
@@ -194 +200 @@
   double Double;
   struct Range Crt, Chan;
+  unsigned int PixelID = 0;
   vector< map<unsigned int, double> > Voltages (Crates.size());
 
@@ -203 +210 @@
           // Skip if first character is not digit
           if (isdigit(Parameter[n][0] == 0)) continue;
+          
+          // Extract pixel ID
+          PixelID = atoi(Parameter[n].c_str());
+
           // Skip if pixel ID not existing 
-          if (PixMap->Pixel_to_HVcrate(atoi(Parameter[n].c_str())) == PixMap->PM_ERROR_CODE) continue;
-
-      Crt.Min = Crt.Max = PixMap->Pixel_to_HVcrate(atoi(Parameter[n].c_str()));
-      Chan.Min = Chan.Max = PixMap->Pixel_to_HVboard(atoi(Parameter[n].c_str()))*NUM_CHANNELS + PixMap->Pixel_to_HVchannel(atoi(Parameter[n].c_str()));
+          if (PixMap->Pixel_to_HVcrate(PixelID) == PixMap->PM_ERROR_CODE) continue;
+
+      Crt.Min = Crt.Max = PixMap->Pixel_to_HVcrate(PixelID);
+      Chan.Min = Chan.Max = PixMap->Pixel_to_HVboard(PixelID)*NUM_CHANNELS + PixMap->Pixel_to_HVchannel(PixelID);
         }
         // Channel identification
@@ -225 +236 @@
         // Convert voltage value and check format 
         if (!ConvertToDouble(Parameter[n+1], &Double)) {
-          PrintMessage("Error: Wrong number format for voltage setting\n");
-          continue;
+          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;
+          }
         }
 

fact/BIASctrl/User.h

@@ -35 +35 @@
 
         std::vector<class Crate *> Crates;
+        std::vector<double> DefaultVoltage;
 
         void commandHandler();