Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindPix.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindPix.cc	(revision 3314)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindPix.cc	(revision 3315)
@@ -194,6 +194,4 @@
 }
 
-
-
 // --------------------------------------------------------------------------
 //
@@ -219,5 +217,5 @@
   switch (fColor)
     {
-    case kEGreen:
+    case kGREEN:
       fMeanFluxInsidePlexiglass    /= gkBlindPixelQEGreen;   
       fMeanFluxErrInsidePlexiglass += gkBlindPixelQEGreenErr*gkBlindPixelQEGreenErr
@@ -227,5 +225,5 @@
       // attenuation has negligible error
       break;
-    case kEBlue:
+    case kBLUE:
       fMeanFluxInsidePlexiglass    /= gkBlindPixelQEBlue;   
       fMeanFluxErrInsidePlexiglass += gkBlindPixelQEBlueErr*gkBlindPixelQEBlueErr
@@ -235,5 +233,5 @@
       // attenuation has negligible error
       break;
-    case kEUV:
+    case kUV:
       fMeanFluxInsidePlexiglass    /= gkBlindPixelQEUV;   
       fMeanFluxErrInsidePlexiglass += gkBlindPixelQEUVErr*gkBlindPixelQEUVErr
@@ -243,5 +241,5 @@
       // attenuation has negligible error
       break;
-    case kECT1:
+    case kCT1:
     default:
       fMeanFluxInsidePlexiglass    /= gkBlindPixelQECT1;   
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindPix.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindPix.h	(revision 3314)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeBlindPix.h	(revision 3315)
@@ -56,10 +56,4 @@
   enum { kOscillating, kPedestalFitOK, kSinglePheFitOK, kChargeFitValid, kExcluded, 
          kFluxInsidePlexiglassAvailable };
-
-public:
-
-  enum PulserColor_t { kEBlue, kEGreen, kEUV, kECT1 } ;
-
-private:
 
   PulserColor_t fColor;  
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.cc	(revision 3314)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.cc	(revision 3315)
@@ -318,20 +318,20 @@
   switch (fColor)
     {
-    case kEGreen:
+    case kGREEN:
       fMeanFluxOutsidePlexiglass    /= gkPINDiodeQEGreen;
       fMeanFluxErrOutsidePlexiglass += gkPINDiodeQEGreenErr*gkPINDiodeQEGreenErr
                                      / gkPINDiodeQEGreen/gkPINDiodeQEGreen;
       break;
-    case kEBlue:
+    case kBLUE:
       fMeanFluxOutsidePlexiglass    /= gkPINDiodeQEBlue;
       fMeanFluxErrOutsidePlexiglass += gkPINDiodeQEBlueErr*gkPINDiodeQEBlueErr
                                      / gkPINDiodeQEBlue/gkPINDiodeQEBlue;
       break; 
-    case kEUV:
+    case kUV:
       fMeanFluxOutsidePlexiglass    /= gkPINDiodeQEUV;
       fMeanFluxErrOutsidePlexiglass += gkPINDiodeQEUVErr*gkPINDiodeQEUVErr
                                      / gkPINDiodeQEUV/gkPINDiodeQEUV;
       break;
-    case kECT1:
+    case kCT1:
     default:
       fMeanFluxOutsidePlexiglass    /= gkPINDiodeQECT1;
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.h	(revision 3314)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargePINDiode.h	(revision 3315)
@@ -66,10 +66,4 @@
   Float_t fMeanFluxOutsidePlexiglass;         //  The mean number of photons in an INNER PIXEL outside the plexiglass
   Float_t fMeanFluxErrOutsidePlexiglass;      //  The uncertainty about the number of photons in an INNER PIXEL  
-
-public:
-
-  enum PulserColor_t { kEBlue, kEGreen, kEUV, kECT1 } ;
-
-private:
 
   PulserColor_t fColor;