Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 3343)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 3344)
@@ -5,10 +5,29 @@
                                                  -*-*- END OF LINE -*-*-
  2004/02/27: Raducci Sebastian 
+
    * mhist/Makefile
      - added mastro in the include list
 
+
  2004/02/27: Abelardo Moralejo
+
    * mmain/MEventDisplay.cc
      - replaced in fill8 obsolete MArrivalTime with MArrivalTimeCam.
+     - Updated display of MC data: removed MCerPhotCalc, and replaced 
+       it by MExtractSignal+MMcCalibrationUpdate+MCalibrate. Now
+       MPedPhotCam is filled and all the camera display tabs are shown 
+       correctly (most were not working for MC events since a while 
+       ago).
+
+   * manalysis/MMcCalibrationUpdate.[h,cc]
+     - Added member variable Bool_t fOuterPixelsScaling, which is 
+       kTRUE by default. If set to kFALSE, MCalibrationCam is filled 
+       such that MCerPhotEvt will later be filled with the signal as it 
+       is, not corrected for the (possibly) different gain of the outer 
+       pixels electronic chain. This option was necessary to allow for
+       the change in the camera display (see above).
+
+   * manalysis/Makefile
+     - Added mcalib to list of include directories.
 
    * macros/starmc.C
Index: /trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc	(revision 3343)
+++ /trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc	(revision 3344)
@@ -81,5 +81,5 @@
 
     fFillCalibrationCam = kTRUE;
-
+    fOuterPixelsGainScaling = kTRUE;
 }
 
@@ -209,7 +209,15 @@
 
     //
-    // Set the ADC to photons conversion factor for outer pixels:
-    //
-    fADC2PhOuter = fADC2PhInner * (fAmplitude / fAmplitudeOuter);
+    // Set the ADC to photons conversion factor for outer pixels.
+    // One can choose not to apply the known (in MC) gain factor between
+    // inner and outer pixels, (fOuterPixelsGainScaling = kFALSE),
+    // which may be useful for display purposes.
+    //
+
+    if (fOuterPixelsGainScaling)
+      fADC2PhOuter = fADC2PhInner * (fAmplitude / fAmplitudeOuter);
+    else
+      fADC2PhOuter = fADC2PhInner;
+
 
     const int num = fCalCam->GetSize();