Changeset 17962 for branches/Mars_McMismatchStudy/mcore/PixelMap.h

Timestamp:

09/01/14 13:44:46 (10 years ago)

Author:

dneise

Message:

these modifications I found in the Mars.svn.2014.05.26 folder of Simona and added them to this branch without further thinking about them. 

File:

• branches/Mars_McMismatchStudy/mcore/PixelMap.h (modified) (5 diffs)

branches/Mars_McMismatchStudy/mcore/PixelMap.h

@@ -27 +27 @@
     int   cbpx;                /// Hardware index as CBPX
     int   gapd;                /// gAPD index
-//    float Vgapd;               /// gAPD Bias voltage
+    float Vgapd;               /// gAPD Bias voltage
     int   hv_board;            /// Bias suppply board
     int   hv_channel;
@@ -41 +41 @@
     int count() const { return pixel()>3 ? 5 : 4; }
     int hv() const    { return hv_channel+hv_board*32; }
+    bool isTM() const { return pixel()%9==8; }
 
     operator bool() const { return index>=0; }
@@ -74 +75 @@
             std::stringstream str(buf);
 
-            int     idummy;
-            float   fdummy;
+            int idummy;
 
             PixelMapEntry entry;
@@ -84 +84 @@
             str >> idummy;
             str >> entry.gapd;
-            str >> fdummy; //entry.Vgapd;
+            str >> entry.Vgapd;
             str >> entry.hv_board;
             str >> entry.hv_channel;
@@ -228 +228 @@
         std::ifstream fin(fname);
 
-        int l = 0;
+        long long int l = 0;
 
         std::string buf;