Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 5976)
+++ trunk/MagicSoft/Mars/Changelog	(revision 5977)
@@ -20,4 +20,12 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/01/24 Abelardo Moralejo
+
+   * manalysis/MMcCalibrationUpdate.cc
+     - Adapted to changes in MCalibrateData from 2005/01/16: moved 
+       qepix.SetAvNormFFactor(1.)  from Process() to ReInit(). Due to 
+       this, for the last week you may have found trouble running 
+       starmc.C and mccalibrate.C.
 
  2005/01/24 Thomas Bretz
Index: trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc	(revision 5976)
+++ trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc	(revision 5977)
@@ -333,4 +333,10 @@
 	    avqe = MCalibrationQEPix::gkDefaultAverageQE*fOuterPixelsLightCollection;
 
+	qepix.SetAvNormFFactor(1.);
+	// This factor should convert the default average QE to average QE 
+	// for a spectrum like that of Cherenkov light. See the documentation 
+	// of MCalibrationQEPix. Here it is 1 because we calibrate using 
+	// Cherenkov light.
+
 	qepix.SetAverageQE(avqe);
     }
@@ -343,4 +349,8 @@
 //
 // Fill the MCerPhotPed object
+//
+// This has to be done on an event by event basis because the (calibrated) pedestal 
+// fluctuations depend on whether, for each pixel, we are using the high gain or the 
+// low gain branch.
 //
 Int_t MMcCalibrationUpdate::Process()
@@ -386,10 +396,4 @@
         MCalibrationQEPix &qepix = (MCalibrationQEPix&)(*fQECam)[i];
 
-	qepix.SetAvNormFFactor(1.);
-	// This factor should convert the default average QE to average QE 
-	// for a spectrum like that of Cherenkov light. See the documentation 
-	// of MCalibrationQEPix. Here it is 1 because we calibrate using 
-	// Cherenkov light.
-
         Float_t qe       = qepix.GetAverageQE();
 	Float_t adc2phot = calpix.GetMeanConvFADC2Phe() / qe;