Changeset 16966 for trunk/Mars/mcore

Timestamp:

07/19/13 12:50:54 (11 years ago)

Author:

tbretz

Message:

Changed sign of the offset, so that the offset/slope combination represents a line in volt-vs-dac, added slope.

File:

• trunk/Mars/mcore/PixelMap.h (modified) (3 diffs)

trunk/Mars/mcore/PixelMap.h

@@ -202 +202 @@
     float Vnom;                /// Channel bias voltage nominal
     float Voff;                /// Channel bias voltage offset
+    float Vslope;              /// Channel bias voltage slope
 
     BiasMapEntry() : hv_board(-1) { }
@@ -248 +249 @@
             str >> entry.Vnom;
             str >> entry.Voff;
+            str >> entry.Vslope;
 
 #ifdef __EXCEPTIONS
@@ -343 +345 @@
         {
             const int ch = it->hv_board*32 + it->hv_channel;
-            volt[ch] = -it->Voff;
+            volt[ch] = it->Voff;
         }
 
         return volt;
     }
+
+    std::vector<float> Vslope() const
+    {
+        std::vector<float> slope(416);
+
+        for (std::vector<BiasMapEntry>::const_iterator it=begin(); it!=end(); it++)
+        {
+            const int ch = it->hv_board*32 + it->hv_channel;
+            slope[ch] = it->Vslope;
+        }
+
+        return slope;
+    }
 };