Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3906)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3907)
@@ -26,4 +26,10 @@
    * mcalib/MHCalibrationRelTimeCam.[h,cc]
      -  Getter and Setter for the reference pixel
+
+   * mcalib/MCalibrate.cc
+     - make error of nphot to be taken from square root of absolute 
+       number of photons instead of number of photons, otherwise 
+       NaN's are obtained
+
 
  2004/04/29: Thomas Bretz
Index: trunk/MagicSoft/Mars/mcalib/MCalibrate.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrate.cc	(revision 3906)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrate.cc	(revision 3907)
@@ -334,8 +334,8 @@
 		  case kFfactor:
 		      if (pix.IsFFactorMethodValid())
-		      {
+                        {
                           calibQE      = qe.GetQECascadesFFactor   ( zenith );
 			  calibQEVar   = qe.GetQECascadesFFactorVar( zenith );
-		      }
+                        }
 		      else
 			  continue;
@@ -394,5 +394,5 @@
       
       nphot    = signal*calibConv/calibQE;
-      nphotErr = calibFFactor*TMath::Sqrt(nphot);
+      nphotErr = calibFFactor*TMath::Sqrt(TMath::Abs(nphot));
 
       if (fCalibrationMode == kFlatCharge)
Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.cc	(revision 3906)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationChargePINDiode.cc	(revision 3907)
@@ -56,9 +56,9 @@
 const Int_t   MHCalibrationChargePINDiode::fgAbsTimeNbins    = 30;
 const Axis_t  MHCalibrationChargePINDiode::fgChargeFirst     = -0.5;
-const Axis_t  MHCalibrationChargePINDiode::fgChargeLast      = 199.5;
-const Int_t   MHCalibrationChargePINDiode::fgChargeNbins     = 200;
-const Int_t   MHCalibrationChargePINDiode::fgRmsChargeNbins  = 100;
+const Axis_t  MHCalibrationChargePINDiode::fgChargeLast      = 1999.5;
+const Int_t   MHCalibrationChargePINDiode::fgChargeNbins     = 2000;
+const Int_t   MHCalibrationChargePINDiode::fgRmsChargeNbins  = 200;
 const Axis_t  MHCalibrationChargePINDiode::fgRmsChargeFirst  = 0.;
-const Axis_t  MHCalibrationChargePINDiode::fgRmsChargeLast   = 100.;  
+const Axis_t  MHCalibrationChargePINDiode::fgRmsChargeLast   = 200.;  
 const Float_t MHCalibrationChargePINDiode::fgTimeLowerLimit  = 3.;
 const Float_t MHCalibrationChargePINDiode::fgTimeUpperLimit  = 4.;
@@ -156,5 +156,5 @@
   MHGausEvents::InitBins();
 
-  fHAbsTime.SetBins(fAbsTimeNbins,fAbsTimeFirst,fAbsTimeLast);
+  fHAbsTime.  SetBins(fAbsTimeNbins,  fAbsTimeFirst,  fAbsTimeLast);
   fHRmsCharge.SetBins(fRmsChargeNbins,fRmsChargeFirst,fRmsChargeLast);