Changeset 15214 for trunk

Timestamp:

03/31/13 12:07:46 (12 years ago)

Author:

tbretz

Message:

Moved a lot of code to the header file, removed dependencies from FACT++ and the need of a source file.

Location:

trunk/Mars/mcore

Files:

• PixelMap.cc (copied) (copied from trunk/FACT++/src/PixelMap.cc ) (2 diffs)
• PixelMap.h (copied) (copied from trunk/FACT++/src/PixelMap.h ) (12 diffs)

trunk/Mars/mcore/PixelMap.cc

@@ -1 @@
-#include "PixelMap.h"
-
-#ifdef __EXCEPTIONS
-#include <stdexcept>
-#endif
-
-#ifdef __MARS__
-#include "MLog.h"
-#include "MLogManip.h"
-#endif
+#include "externals/PixelMap.h"
 
 using namespace std;
 
-const PixelMapEntry PixelMap::empty = { -1, 0, 0, 0, 0 };
-const BiasMapEntry  BiasMap::empty  = { -1, 0, 0, 0 };
-
-bool BiasMap::Read(const std::string &fname)
-{
-    std::ifstream fin(fname);
-
-    int l = 0;
-
-    std::string buf;
-    while (getline(fin, buf, '\n'))
-    {
-        if (l>416)
-            break;
-
-        buf = Tools::Trim(buf);
-        if (buf[0]=='#')
-            continue;
-
-        std::stringstream str(buf);
-
-        BiasMapEntry entry;
-
-        str >> entry.hv_board;
-        str >> entry.hv_channel;
-        str >> entry.Vnom;
-        str >> entry.Voff;
-
-#ifdef __EXCEPTIONS
-        if (entry.hv_channel+32*entry.hv_board>=416)
-            throw runtime_error("Invalid board/channel read from "+fname+".");
-#endif
-#ifdef __MARS__
-        if (entry.hv_channel+32*entry.hv_board>=416)
-        {
-            gLog << err << "Invalid board/channel read from " << fname << "." << endl;
-            return false;
-        }
-#endif
-
-        (*this)[entry.hv()] = entry;
-
-        l++;
-    }
-
-#ifdef __EXCEPTIONS
-    if (l!=416)
-        throw runtime_error("Number of lines read from "+fname+" does not match 416.");
-
-    if (size()!=416)
-        throw runtime_error("Number of entries read from "+fname+" does not match 416.");
-#endif
-
-#ifdef __MARS__
-    if (l!=416)
-    {
-        gLog << err  << "Number of lines read from " << fname << " does not match 416." << endl;
-        return false;
-    }
-
-    if (size()!=416)
-    {
-        gLog << "Number of entries read from " << fname << " does not match 416." << endl;
-        return false;
-    }
-#endif
-
-    return true;
-}
-
-#ifndef __MARS__
 #include <boost/regex.hpp>
 #include <mysql++/mysql++.h>
@@ -148 +68 @@
         throw runtime_error("Number of entries retrived from database does not match 416.");
 }
-#endif

trunk/Mars/mcore/PixelMap.h

@@ -7 +7 @@
 #include <sstream>
 
-#include "tools.h"
-
 #ifdef DEBUG
 #include <iostream>  // cerr -- to be removed?
+#endif
+
+#ifdef __EXCEPTIONS
+#include <stdexcept>
+#endif
+
+#ifdef __MARS__
+#include "MLog.h"
+#include "MLogManip.h"
 #endif
 
@@ -22 +29 @@
 //    float Vgapd;               /// gAPD Bias voltage
     int   hv_board;            /// Bias suppply board
-    int   hv_channel;          /// Bias supply channel
+    int   hv_channel;
+
+    PixelMapEntry() : index(-1) { } /// Bias supply channel
 
     int crate() const { return cbpx/1000; }
@@ -33 +42 @@
 
     operator bool() const { return index>=0; }
+
+    static const PixelMapEntry &empty() { const static PixelMapEntry e; return e; }
 };
 
@@ -38 +49 @@
 {
 public:
-    static const PixelMapEntry empty;
-
     PixelMap() : std::vector<PixelMapEntry>(1440)
     {
@@ -56 +65 @@
                 break;
 
-            buf = Tools::Trim(buf);
-            if (buf[0]=='#')
+            buf.erase(buf.find_last_not_of(' ')+1);         //surfixing spaces
+            buf.erase(0, buf.find_first_not_of(' '));       //prefixing spaces
+ 
+            if (buf.empty() || buf[0]=='#')
                 continue;
 
@@ -101 +112 @@
         std::cerr << "PixelMap: index " << idx << " not found" << std::endl;
 #endif
-        return empty;
+        return PixelMapEntry::empty();
     }
 
@@ -112 +123 @@
         std::cerr << "PixelMap: cbpx " << c << " not found" << std::endl;
 #endif
-        return empty;
+        return PixelMapEntry::empty();
     }
 
@@ -133 +144 @@
         std::cerr << "PixelMap: hv " << board << "/" << channel << " not found" << std::endl;
 #endif
-        return empty;
+        return PixelMapEntry::empty();
     }
 
@@ -192 +203 @@
     float Voff;                /// Channel bias voltage offset
 
+    BiasMapEntry() : hv_board(-1) { }
+
     int hv() const { return hv_channel+hv_board*32; }
+
+    operator bool() const { return hv_board>=0; }
+
+    static const BiasMapEntry &empty() { const static BiasMapEntry e; return e; }
 };
 
@@ -198 +215 @@
 {
 public:
-    static const BiasMapEntry empty;
-
     BiasMap() : std::vector<BiasMapEntry>(416)
     {
@@ -207 +222 @@
     void Retrieve(const std::string &database);
 #endif
-    bool Read(const std::string &fname);
+    bool Read(const std::string &fname)
+    {
+        std::ifstream fin(fname);
+
+        int l = 0;
+
+        std::string buf;
+        while (getline(fin, buf, '\n'))
+        {
+            if (l>416)
+                break;
+
+            buf.erase(buf.find_last_not_of(' ')+1);         //surfixing spaces
+            buf.erase(0, buf.find_first_not_of(' '));       //prefixing spaces
+
+            if (buf.empty() || buf[0]=='#')
+                continue;
+
+            std::stringstream str(buf);
+
+            BiasMapEntry entry;
+
+            str >> entry.hv_board;
+            str >> entry.hv_channel;
+            str >> entry.Vnom;
+            str >> entry.Voff;
+
+#ifdef __EXCEPTIONS
+            if (entry.hv_channel+32*entry.hv_board>=416)
+                throw std::runtime_error("Invalid board/channel read from "+fname+".");
+#endif
+#ifdef __MARS__
+            if (entry.hv_channel+32*entry.hv_board>=416)
+            {
+                gLog << err << "Invalid board/channel read from " << fname << "." << endl;
+                return false;
+            }
+#endif
+
+            (*this)[entry.hv()] = entry;
+
+            l++;
+        }
+
+#ifdef __EXCEPTIONS
+        if (l!=416)
+            throw std::runtime_error("Number of lines read from "+fname+" does not match 416.");
+
+        if (size()!=416)
+            throw std::runtime_error("Number of entries read from "+fname+" does not match 416.");
+#endif
+
+#ifdef __MARS__
+        if (l!=416)
+        {
+            gLog << err  << "Number of lines read from " << fname << " does not match 416." << endl;
+            return false;
+        }
+
+        if (size()!=416)
+        {
+            gLog << "Number of entries read from " << fname << " does not match 416." << endl;
+            return false;
+        }
+#endif
+
+        return true;
+    }
 
     const BiasMapEntry &hv(int board, int channel) const
@@ -217 +299 @@
         std::cerr << "PixelMap: hv " << board << "/" << channel << " not found" << std::endl;
 #endif
-        return empty;
+        return BiasMapEntry::empty();
     }