Changeset 15212

Timestamp:

03/31/13 11:35:58 (12 years ago)

Author:

tbretz

Message:

Made aware of Mars.

Location:

trunk/FACT++/src

Files:

• PixelMap.cc (modified) (6 diffs)
• PixelMap.h (modified) (2 diffs)

trunk/FACT++/src/PixelMap.cc

@@ -1 +1 @@
 #include "PixelMap.h"
 
-#include <boost/regex.hpp>
+#ifdef __EXCEPTIONS
+#include <stdexcept>
+#endif
 
-//#ifdef HAS_SQL
-#include <mysql++/mysql++.h>
-//#endif
+#ifdef __MARS__
+#include "MLog.h"
+#include "MLogManip.h"
+#endif
 
 using namespace std;
@@ -12 +15 @@
 const BiasMapEntry  BiasMap::empty  = { -1, 0, 0, 0 };
 
-void BiasMap::Read(const std::string &fname)
+bool BiasMap::Read(const std::string &fname)
 {
     std::ifstream fin(fname);
@@ -37 +40 @@
         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;
@@ -45 +57 @@
     }
 
+#ifdef __EXCEPTIONS
     if (l!=416)
         throw runtime_error("Number of lines read from "+fname+" does not match 416.");
@@ -50 +63 @@
     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>
 
 void BiasMap::Retrieve(const std::string &database)
@@ -114 +148 @@
         throw runtime_error("Number of entries retrived from database does not match 416.");
 }
+#endif

trunk/FACT++/src/PixelMap.h

@@ -2 +2 @@
 #define FACT_PixelMap
 
-#include<vector>
-#include<string>
-#include<fstream>
-#include<sstream>
+#include <vector>
+#include <string>
+#include <fstream>
+#include <sstream>
 
 #include "tools.h"
 
 #ifdef DEBUG
-#include<iostream>  // cerr -- to be removed?
+#include <iostream>  // cerr -- to be removed?
 #endif
 
@@ -204 +204 @@
     }
 
+#ifndef __MARS__
     void Retrieve(const std::string &database);
-    void Read(const std::string &fname);
+#endif
+    bool Read(const std::string &fname);
 
     const BiasMapEntry &hv(int board, int channel) const