Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3243)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3244)
@@ -17,4 +17,5 @@
      - took out some configuration numbers and put them directly into 
        the class
+     - remove completely MCalibrationConfig.h
 
 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc	(revision 3243)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc	(revision 3244)
@@ -48,5 +48,4 @@
 //////////////////////////////////////////////////////////////////////////////
 #include "MCalibrateData.h"
-#include "MCalibrationConfig.h"
 
 #include "MLog.h"
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc	(revision 3243)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc	(revision 3244)
@@ -79,7 +79,4 @@
 // FXIME: Usage of fstream is a preliminary workaround!
 #include <fstream>
-
-// FXIME: This has to be removed!!!! (YES, WHEN WE HAVE ACCESS TO THE DATABASE!!!!!)
-#include "MCalibrationConfig.h"
 
 #include <TSystem.h>
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc	(revision 3243)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc	(revision 3244)
@@ -127,5 +127,4 @@
 
 #include "MCalibrationPix.h"
-#include "MCalibrationConfig.h"
 #include "MCalibrationBlindPix.h"
 #include "MCalibrationPINDiode.h"
@@ -157,5 +156,39 @@
 const Float_t MCalibrationCam::gkCalibrationBlindPixelAttCT1   = 1.95;
 
-
+// ----- PIN DIODE ------------------------//
+//
+// Area of Inner Pixel w.r.t. PIN Diode (which is 1 cm2)
+//
+// Distance of PIN Diode to pulser D1:   1.5  +- 0.3 m
+// Distance of Inner Pixel to pulser D2: 18.0 +- 0.5 m
+//
+//
+//                 D1*D1
+// conversion C = ------ = 0.0069
+//                 D2*D2
+//
+// Delta C / C  = 2 * Sqrt( (Delta D1/D1)2 + (Delta D2/D2)2 )
+// Delta C / C  = 0.4
+// 
+// C = 0.007 +- 0.003
+//
+const Float_t MCalibrationCam::gkCalibrationFluxCameravsPINDiode      = 0.007;
+const Float_t MCalibrationCam::gkCalibrationFluxCameravsPINDiodeErr   = 0.003;
+
+//
+// Average QE of the PIN Diode
+//
+const Float_t MCalibrationCam::gkCalibrationPINDiodeQEGreen = -1.0;
+const Float_t MCalibrationCam::gkCalibrationPINDiodeQEBlue  = -1.0;
+const Float_t MCalibrationCam::gkCalibrationPINDiodeQEUV    = -1.0;
+const Float_t MCalibrationCam::gkCalibrationPINDiodeQECT1   = -1.0;
+
+//
+// Average QE of the PIN Diode
+//
+const Float_t MCalibrationCam::gkCalibrationPINDiodeQEGreenErr = -1.0;
+const Float_t MCalibrationCam::gkCalibrationPINDiodeQEBlueErr  = -1.0;
+const Float_t MCalibrationCam::gkCalibrationPINDiodeQEUVErr    = -1.0;
+const Float_t MCalibrationCam::gkCalibrationPINDiodeQECT1Err   = -1.0;
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h	(revision 3243)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h	(revision 3244)
@@ -41,4 +41,17 @@
   static const Float_t gkCalibrationBlindPixelAttCT1  ;
 
+  static const Float_t gkCalibrationFluxCameravsPINDiode     ;
+  static const Float_t gkCalibrationFluxCameravsPINDiodeErr  ;
+  
+  static const Float_t gkCalibrationPINDiodeQEGreen;
+  static const Float_t gkCalibrationPINDiodeQEBlue ;
+  static const Float_t gkCalibrationPINDiodeQEUV   ;
+  static const Float_t gkCalibrationPINDiodeQECT1  ;
+  
+  static const Float_t gkCalibrationPINDiodeQEGreenErr;
+  static const Float_t gkCalibrationPINDiodeQEBlueErr ;
+  static const Float_t gkCalibrationPINDiodeQEUVErr   ;
+  static const Float_t gkCalibrationPINDiodeQECT1Err  ;
+ 
   Int_t fNumPixels;
   TClonesArray *fPixels;                      //-> Array of MCalibrationPix with fit results
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationConfig.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationConfig.h	(revision 3243)
+++ 	(revision )
@@ -1,50 +1,0 @@
-#ifndef MARS_MCalibrationConfig
-#define MARS_MCalibrationConfig
-
-/////////////////////////////////////////////////////////////////////////////
-//                                                                         
-// MCalibrationConfig                                                      
-//
-// Contains all configuration data of the Calibration          
-//                                                             
-// This file is only TEMPORARY. It values will go into the DATABASE 
-//
-/////////////////////////////////////////////////////////////////////////////
-// ----- PIN DIODE ------------------------//
-
-//
-// Area of Inner Pixel w.r.t. PIN Diode (which is 1 cm²)
-//
-// Distance of PIN Diode to pulser D1:   1.5  +- 0.3 m
-// Distance of Inner Pixel to pulser D2: 18.0 +- 0.5 m
-//
-//
-//                 D1*D1
-// conversion C = ------ = 0.0069
-//                 D2*D2
-//
-// Delta C / C  = 2 * Sqrt( (Delta D1/D1)² + (Delta D2/D2)² )
-// Delta C / C  = 0.4
-// 
-// C = 0.007 +- 0.003
-//
-const Float_t gkCalibrationFluxCameravsPINDiode      = 0.007;
-const Float_t gkCalibrationFluxCameravsPINDiodeErr   = 0.003;
-
-//
-// Average QE of the PIN Diode
-//
-const Float_t gkCalibrationPINDiodeQEGreen = -1.0;
-const Float_t gkCalibrationPINDiodeQEBlue  = -1.0;
-const Float_t gkCalibrationPINDiodeQEUV    = -1.0;
-const Float_t gkCalibrationPINDiodeQECT1   = -1.0;
-
-//
-// Average QE of the PIN Diode
-//
-const Float_t gkCalibrationPINDiodeQEGreenErr = -1.0;
-const Float_t gkCalibrationPINDiodeQEBlueErr  = -1.0;
-const Float_t gkCalibrationPINDiodeQEUVErr    = -1.0;
-const Float_t gkCalibrationPINDiodeQECT1Err   = -1.0;
-
-#endif /* MARS_MCalibrationConfig */
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc	(revision 3243)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc	(revision 3244)
@@ -86,5 +86,4 @@
 /////////////////////////////////////////////////////////////////////////////
 #include "MCalibrationPix.h"
-#include "MCalibrationConfig.h"
 
 #include "MLog.h"