Changeset 13239

Timestamp:

03/26/12 22:03:31 (13 years ago)

Author:

tbretz

Message:

Propagate G-APD bias offset and set-point seperately.

File:

• trunk/FACT++/src/PixelMap.h (modified) (3 diffs)

trunk/FACT++/src/PixelMap.h

@@ -223 +223 @@
     }
 
+    /*
     float Vgapd(int board, int channel) const
     {
         const BiasMapEntry &entry = hv(board, channel);
-        //return entry.Vnom/*-entry.Voff*/; // for testing purposes only
         return entry.Vnom - entry.Voff; // use this with GAPDmap_20111126.txt
     }
@@ -233 +233 @@
     {
         return Vgapd(idx/32, idx%32);
-    }
+    }*/
 
     std::vector<float> Vgapd() const
@@ -242 +242 @@
         {
             const int ch = it->hv_board*32 + it->hv_channel;
-            
-            //volt[ch] += it->Vnom/*-it->Voff*/; // for testing purposes only
-            volt[ch] += it->Vnom - it->Voff; // use this with GAPDmap_20111126.txt
+            volt[ch] = it->Vnom;
         }
 
         return volt;
     }
-};
-
-#endif
+    std::vector<float> Voffset() const
+    {
+        std::vector<float> volt(416);
+
+        for (std::vector<BiasMapEntry>::const_iterator it=begin(); it!=end(); it++)
+        {
+            const int ch = it->hv_board*32 + it->hv_channel;
+            volt[ch] = -it->Voff;
+        }
+
+        return volt;
+    }
+};
+
+#endif