Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3242)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3243)
@@ -12,4 +12,9 @@
      - standardized naming of variables containing "Error", this also affected 
        the calling functions MCalibrate, MMcCalibrationUpdate and MCalibrateData
+
+   * mcalib/MCalibrationCam.cc
+   * mcalib/MCalibrationConfig.h
+     - took out some configuration numbers and put them directly into 
+       the class
 
 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc	(revision 3242)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc	(revision 3243)
@@ -141,4 +141,21 @@
 const Float_t MCalibrationCam::gkBlindPixelArea = 100;
 const Float_t MCalibrationCam::gkPINDiodeArea   = 100;
+// Average QE of Blind Pixel (three colours)
+const Float_t MCalibrationCam::gkCalibrationBlindPixelQEGreen = 0.154;
+const Float_t MCalibrationCam::gkCalibrationBlindPixelQEBlue  = 0.226;
+const Float_t MCalibrationCam::gkCalibrationBlindPixelQEUV    = 0.247;
+const Float_t MCalibrationCam::gkCalibrationBlindPixelQECT1   = 0.247;
+// Average QE Error of Blind Pixel (three colours)
+const Float_t MCalibrationCam::gkCalibrationBlindPixelQEGreenErr = 0.015;
+const Float_t MCalibrationCam::gkCalibrationBlindPixelQEBlueErr  = 0.02;
+const Float_t MCalibrationCam::gkCalibrationBlindPixelQEUVErr    = 0.02;
+const Float_t MCalibrationCam::gkCalibrationBlindPixelQECT1Err   = 0.02;
+// Attenuation factor Blind Pixel (three colours)
+const Float_t MCalibrationCam::gkCalibrationBlindPixelAttGreen = 1.97;
+const Float_t MCalibrationCam::gkCalibrationBlindPixelAttBlue  = 1.96;
+const Float_t MCalibrationCam::gkCalibrationBlindPixelAttUV    = 1.95;
+const Float_t MCalibrationCam::gkCalibrationBlindPixelAttCT1   = 1.95;
+
+
 
 // --------------------------------------------------------------------------
@@ -841,5 +858,5 @@
     case kECGreen:
       fMeanFluxInsidePlexiglass    /= gkCalibrationBlindPixelQEGreen;   
-      fMeanFluxErrInsidePlexiglass += gkCalibrationBlindPixelQEGreenError*gkCalibrationBlindPixelQEGreenError
+      fMeanFluxErrInsidePlexiglass += gkCalibrationBlindPixelQEGreenErr*gkCalibrationBlindPixelQEGreenErr
                                     / gkCalibrationBlindPixelQEGreen  /   gkCalibrationBlindPixelQEGreen;   
 
@@ -849,5 +866,5 @@
     case kECBlue:
       fMeanFluxInsidePlexiglass    /= gkCalibrationBlindPixelQEBlue;   
-      fMeanFluxErrInsidePlexiglass += gkCalibrationBlindPixelQEBlueError*gkCalibrationBlindPixelQEBlueError
+      fMeanFluxErrInsidePlexiglass += gkCalibrationBlindPixelQEBlueErr*gkCalibrationBlindPixelQEBlueErr
                                     / gkCalibrationBlindPixelQEBlue  /   gkCalibrationBlindPixelQEBlue;   
 
@@ -857,5 +874,5 @@
     case kECUV:
       fMeanFluxInsidePlexiglass    /= gkCalibrationBlindPixelQEUV;   
-      fMeanFluxErrInsidePlexiglass += gkCalibrationBlindPixelQEUVError*gkCalibrationBlindPixelQEUVError
+      fMeanFluxErrInsidePlexiglass += gkCalibrationBlindPixelQEUVErr*gkCalibrationBlindPixelQEUVErr
                                     / gkCalibrationBlindPixelQEUV  /   gkCalibrationBlindPixelQEUV;   
 
@@ -866,5 +883,5 @@
     default:
       fMeanFluxInsidePlexiglass    /= gkCalibrationBlindPixelQECT1;   
-      fMeanFluxErrInsidePlexiglass += gkCalibrationBlindPixelQECT1Error*gkCalibrationBlindPixelQECT1Error
+      fMeanFluxErrInsidePlexiglass += gkCalibrationBlindPixelQECT1Err*gkCalibrationBlindPixelQECT1Err
                                     / gkCalibrationBlindPixelQECT1  /   gkCalibrationBlindPixelQECT1;   
 
@@ -956,5 +973,5 @@
   // Start calculation of number of photons relative Variance (!!)
   fMeanFluxErrOutsidePlexiglass  = merr*merr/mean/mean;
-  fMeanFluxErrOutsidePlexiglass += gkCalibrationFluxCameravsPINDiodeError*gkCalibrationFluxCameravsPINDiodeError
+  fMeanFluxErrOutsidePlexiglass += gkCalibrationFluxCameravsPINDiodeErr*gkCalibrationFluxCameravsPINDiodeErr
                                  / gkCalibrationFluxCameravsPINDiode/gkCalibrationFluxCameravsPINDiode;
   
@@ -963,15 +980,15 @@
     case kECGreen:
       fMeanFluxOutsidePlexiglass    /= gkCalibrationPINDiodeQEGreen;
-      fMeanFluxErrOutsidePlexiglass += gkCalibrationPINDiodeQEGreenError*gkCalibrationPINDiodeQEGreenError
+      fMeanFluxErrOutsidePlexiglass += gkCalibrationPINDiodeQEGreenErr*gkCalibrationPINDiodeQEGreenErr
                                      / gkCalibrationPINDiodeQEGreen/gkCalibrationPINDiodeQEGreen;
       break;
     case kECBlue:
       fMeanFluxOutsidePlexiglass    /= gkCalibrationPINDiodeQEBlue;
-      fMeanFluxErrOutsidePlexiglass += gkCalibrationPINDiodeQEBlueError*gkCalibrationPINDiodeQEBlueError
+      fMeanFluxErrOutsidePlexiglass += gkCalibrationPINDiodeQEBlueErr*gkCalibrationPINDiodeQEBlueErr
                                      / gkCalibrationPINDiodeQEBlue/gkCalibrationPINDiodeQEBlue;
       break; 
     case kECUV:
       fMeanFluxOutsidePlexiglass    /= gkCalibrationPINDiodeQEUV;
-      fMeanFluxErrOutsidePlexiglass += gkCalibrationPINDiodeQEUVError*gkCalibrationPINDiodeQEUVError
+      fMeanFluxErrOutsidePlexiglass += gkCalibrationPINDiodeQEUVErr*gkCalibrationPINDiodeQEUVErr
                                      / gkCalibrationPINDiodeQEUV/gkCalibrationPINDiodeQEUV;
       break;
@@ -979,5 +996,5 @@
     default:
       fMeanFluxOutsidePlexiglass    /= gkCalibrationPINDiodeQECT1;
-      fMeanFluxErrOutsidePlexiglass += gkCalibrationPINDiodeQECT1Error*gkCalibrationPINDiodeQECT1Error
+      fMeanFluxErrOutsidePlexiglass += gkCalibrationPINDiodeQECT1Err*gkCalibrationPINDiodeQECT1Err
                                      / gkCalibrationPINDiodeQECT1/gkCalibrationPINDiodeQECT1;
       break;
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h	(revision 3242)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h	(revision 3243)
@@ -25,4 +25,19 @@
   static const Float_t gkBlindPixelArea;       // The Blind Pixel area in mm^2
   static const Float_t gkPINDiodeArea;         // The Blind Pixel area in mm^2  
+
+  static const Float_t gkCalibrationBlindPixelQEGreen;
+  static const Float_t gkCalibrationBlindPixelQEBlue ;
+  static const Float_t gkCalibrationBlindPixelQEUV   ;
+  static const Float_t gkCalibrationBlindPixelQECT1  ;
+
+  static const Float_t gkCalibrationBlindPixelQEGreenErr;
+  static const Float_t gkCalibrationBlindPixelQEBlueErr ;
+  static const Float_t gkCalibrationBlindPixelQEUVErr   ;
+  static const Float_t gkCalibrationBlindPixelQECT1Err  ;
+ 
+  static const Float_t gkCalibrationBlindPixelAttGreen;
+  static const Float_t gkCalibrationBlindPixelAttBlue ;
+  static const Float_t gkCalibrationBlindPixelAttUV   ;
+  static const Float_t gkCalibrationBlindPixelAttCT1  ;
 
   Int_t fNumPixels;
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationConfig.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationConfig.h	(revision 3242)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationConfig.h	(revision 3243)
@@ -11,27 +11,4 @@
 //
 /////////////////////////////////////////////////////////////////////////////
-// ----- BLIND PIXEL ----------------------//
-
-// Average QE of Blind Pixel (three colours)
-const Float_t gkCalibrationBlindPixelQEGreen = 0.154;
-const Float_t gkCalibrationBlindPixelQEBlue  = 0.226;
-const Float_t gkCalibrationBlindPixelQEUV    = 0.247;
-const Float_t gkCalibrationBlindPixelQECT1   = 0.247;
-
-// Average QE Error of Blind Pixel (three colours)
-const Float_t gkCalibrationBlindPixelQEGreenError = 0.015;
-const Float_t gkCalibrationBlindPixelQEBlueError  = 0.02;
-const Float_t gkCalibrationBlindPixelQEUVError    = 0.02;
-const Float_t gkCalibrationBlindPixelQECT1Error   = 0.02;
-
-// Attenuation factor Blind Pixel (three colours)
-const Float_t gkCalibrationBlindPixelAttGreen = 1.97;
-const Float_t gkCalibrationBlindPixelAttBlue  = 1.96;
-const Float_t gkCalibrationBlindPixelAttUV    = 1.95;
-const Float_t gkCalibrationBlindPixelAttCT1   = 1.95;
-
-const Float_t gkCalibrationOutervsInnerPixelArea      = 4.0;
-const Float_t gkCalibrationOutervsInnerPixelAreaError = 0.2;
-
 // ----- PIN DIODE ------------------------//
 
@@ -53,5 +30,5 @@
 //
 const Float_t gkCalibrationFluxCameravsPINDiode      = 0.007;
-const Float_t gkCalibrationFluxCameravsPINDiodeError = 0.003;
+const Float_t gkCalibrationFluxCameravsPINDiodeErr   = 0.003;
 
 //
@@ -66,8 +43,8 @@
 // Average QE of the PIN Diode
 //
-const Float_t gkCalibrationPINDiodeQEGreenError = -1.0;
-const Float_t gkCalibrationPINDiodeQEBlueError  = -1.0;
-const Float_t gkCalibrationPINDiodeQEUVError    = -1.0;
-const Float_t gkCalibrationPINDiodeQECT1Error   = -1.0;
+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 */