From 5057fd4eef71b8facf474ba599c61fe09b0c8b37 Mon Sep 17 00:00:00 2001
From: Anna Bergamaschi <anna.bergamaschi@psi.ch>
Date: Thu, 24 Sep 2015 11:10:12 +0200
Subject: [PATCH] changed energyConversion.h to compile the calibration wizards

---
 .../slsDetectorAnalysis/energyConversion.h                | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.h b/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.h
index acef54cc5..add87981e 100644
--- a/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.h
+++ b/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.h
@@ -1,11 +1,13 @@
 #ifndef ENERGYCONVERSION_H
 #define ENERGYCONVERSION_H
 
-#ifdef __CINT
+#ifdef __CINT__
 #define MYROOT
+#define __cplusplus
 #endif
 
 //#ifndef MYROOT
+//#include "sls_receiver_defs.h"
 #include "sls_detector_defs.h"
 //#endif
 
@@ -18,9 +20,9 @@ using namespace std;
 
 
 class energyConversion 
-#ifndef MYROOT
+//#ifndef MYROOT
 : private virtual slsDetectorDefs
-#endif
+  //#endif
 {
  public:
   /** default constrauctor */