Index: /trunk/MagicSoft/Mars/mcalib/MCalibrate.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrate.cc	(revision 3278)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrate.cc	(revision 3279)
@@ -184,7 +184,7 @@
   UInt_t npix = fSignals->GetSize();
 
-  Float_t hiloconv      = 1.;
+  Float_t hiloconv      = 0.;
   Float_t hiloconverr   = 0.;
-  Float_t calibrationConversionFactor    = 1.;
+  Float_t calibrationConversionFactor    = 0.;
   Float_t calibrationConversionFactorErr = 0.;
   
@@ -197,7 +197,4 @@
 	  if (!pix.IsChargeValid())
 	    continue;
-	  
-	  hiloconv   = pix.GetConversionHiLo();
-	  hiloconverr= pix.GetConversionHiLoErr();
 	  
 	  switch(fCalibrationMode)
@@ -209,4 +206,6 @@
 		    calibrationConversionFactorErr   = pix.GetConversionBlindPixelMethodErr();
 		}
+		else
+		    continue;
 	      break;
 	    case kPinDiode:
@@ -216,4 +215,6 @@
 		    calibrationConversionFactorErr   = pix.GetConversionPINDiodeMethodErr();
 		}
+		else
+		    continue;
 	      break;
 	    case kFfactor:
@@ -223,4 +224,6 @@
 		    calibrationConversionFactorErr   = pix.GetConversionFFactorMethodErr();
 		}
+		else
+		    continue;
 	      break;
 	    case kCombined:
@@ -230,11 +233,20 @@
 		    calibrationConversionFactorErr   = pix.GetConversionCombinedMethodErr();
 		}
+		else
+		    continue;
 		break;
             case kDummy:
+	      hiloconv                         = 1.;
+	      hiloconverr                      = 0.;
 	      calibrationConversionFactor      = 1.;
 	      calibrationConversionFactorErr   = 0.;
               break;
-	    }
-	}
+
+	    } /* switch calibration mode */
+	  
+	  hiloconv   = pix.GetConversionHiLo();
+	  hiloconverr= pix.GetConversionHiLoErr();
+	  
+	} /* if(fCalibrationMode!=kNone) */
       
       MExtractedSignalPix &sig =  (*fSignals)[pixidx];
@@ -272,5 +284,6 @@
       if (sig.GetNumLoGainSaturated() > 0)
 	cpix->SetPixelSaturated();
-    }
+
+    } /* for (UInt_t pixidx=0; pixidx<npix; pixidx++) */
   
   fCerPhotEvt->FixSize();