Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3115)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3116)
@@ -11,4 +11,16 @@
    * mcalib/MHGausEvent.cc:
      - corrected call to StripZeros
+
+   * mcalib/MCalibrationPix.[h,cc]
+     - implemented dummy for combined method
+
+   * mcalib/MCalibrate.[h,cc]
+     - implemented a dummy for calibration factor 1. 
+       (requested by Javier Rico)
+     - implemented combined method
+     - check for valid methods moved to ReInit
+
+   * mcalib/MCalibrationCalc.cc
+     - removed initialization of non-used nsamples
 
 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrate.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrate.cc	(revision 3115)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrate.cc	(revision 3116)
@@ -135,4 +135,31 @@
     }
 
+  switch(fCalibrationMode)
+    {
+    case kBlindPixel:
+      break;
+    case kFfactor:
+      break;
+    case kPinDiode:
+      *fLog << err << GetDescriptor() 
+                    << ": PIN Diode Calibration mode not yet available " << endl;
+      return kFALSE;
+      break;
+    case kCombined:
+      *fLog << err << GetDescriptor() 
+                    << ": Combined Calibration mode not yet available " << endl;
+      return kFALSE;
+      break;
+    case kDummy:
+      *fLog << warn << GetDescriptor() 
+                    << ": WARNING: Dummy calibration, no calibration applied!!" << endl;
+      break;
+    default:
+      *fLog << warn << GetDescriptor() 
+            << ": WARNING: Calibration mode value ("
+            <<fCalibrationMode<<") not known" << endl;
+      return kFALSE;
+    }
+  
   return kTRUE;
 }
@@ -181,11 +208,20 @@
 	      calibrationConversionFactorError = pix.GetErrorConversionBlindPixelMethod();
 	      break;
+	    case kPinDiode:
+	      calibrationConversionFactor      = pix.GetMeanConversionPINDiodeMethod();
+	      calibrationConversionFactorError = pix.GetErrorConversionPINDiodeMethod();
+	      break;
 	    case kFfactor:
 	      calibrationConversionFactor      = pix.GetMeanConversionFFactorMethod();
 	      calibrationConversionFactorError = pix.GetErrorConversionFFactorMethod();
 	      break;
-	    default:
-	      *fLog << warn << "MCalibrate::Process Warning: Calibration mode value ("<<fCalibrationMode<<") not known" << endl;
-	      break;
+	    case kCombined:
+	      calibrationConversionFactor      = pix.GetMeanConversionCombinedMethod();
+	      calibrationConversionFactorError = pix.GetErrorConversionCombinedMethod();
+	      break;
+            case kDummy:
+	      calibrationConversionFactor      = 1.;
+	      calibrationConversionFactorError = 0.;
+              break;
 	    }
 	}
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc	(revision 3115)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc	(revision 3116)
@@ -527,8 +527,7 @@
               blindpixel.FillGraphs(blindpixelsumhi,blindpixelsumlo);
           
-#if 0              
               TH1I *hist = blindpixel.GetSinglePheFADCSlices();
 
-              if (blindpixelsumhi > 300.)
+              if (blindpixelsumhi > 50.)
                 {
                   ptr = pixel.GetHiGainSamples();
@@ -539,5 +538,4 @@
                     hist->Fill(i,*ptr++);
                 }
-#endif              
             } /* if use blind pixel */
           
@@ -786,5 +784,4 @@
   Byte_t *start   = ptr + fBlindPixelFirst-1;
   Byte_t *end     = ptr + fBlindPixelLast;
-  Byte_t nsamples = fBlindPixelLast-fgBlindPixelFirst+1;
 
   Byte_t sum = 0;