Changeset 11781 for fact/BIASctrl

Timestamp:

08/05/11 12:27:35 (13 years ago)

Author:

ogrimm

Message:

Default voltages now given per bias channel

Location:

fact/BIASctrl

Files:

• History.txt (modified) (1 diff)
• User.cc (modified) (2 diffs)

fact/BIASctrl/History.txt

@@ -15 +15 @@
 12/7/2011       Default voltages implemented for pixel command.
 4/8/2011        'pixel' and 'channel' commands accept 'info' parameter.
+5/8/2011        Default voltages now given per bias channel, not per pixel

fact/BIASctrl/User.cc

@@ -273 +273 @@
                 // Print pixel information
                 vector<unsigned int> List = PixMap->HV_to_Pixel(Crate, Channel/NUM_CHANNELS, Channel%NUM_CHANNELS);
-                PrintMessage("\n  Pixel IDs (default voltage): ");
-                for (unsigned int j=0; j<List.size(); j++) PrintMessage("%u (%.2f)   ", List[j], List[j]<DefaultVoltage.size() ? DefaultVoltage[List[j]] : 0);
+                PrintMessage("\n  Default voltage: %.2f    Pixel IDs: ", Channel < DefaultVoltage.size() ? DefaultVoltage[Channel] : 0);
+                for (unsigned int j=0; j<List.size(); j++) PrintMessage("%u ", List[j]);
                 if (List.empty()) PrintMessage("none");
 
@@ -296 +296 @@
           // Should the default value be set?
           if (Match(Parameter[n+1], "default")) {
-                vector<unsigned int> List = PixMap->HV_to_Pixel(Crate, Channel/NUM_CHANNELS, Channel%NUM_CHANNELS);
-                if (!List.empty() && List[0]<DefaultVoltage.size()) Double = DefaultVoltage[List[0]];
+                if (Channel < DefaultVoltage.size()) Double = DefaultVoltage[Channel];
                 else Double = 0;
           }