Index: trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.cc	(revision 3851)
+++ trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.cc	(revision 3852)
@@ -73,6 +73,11 @@
     fTitle = title ? title : "Calculate and write conversion factors into MCalibrationChargeCam and MCalibrationQECam containers";
 
-    fHistRatio = new TH1F(AddSerialNumber("HistRatio"), "log10(fPhotElfromShower/fSize)", 1500, -3., 3.);
-    fHistRatio->SetXTitle("log_{10}(fPhotElfromShower / fSize) [photel/ADC count]");
+    fHistADC2PhotEl = new TH1F(AddSerialNumber("ADC2PhotEl"), "log10(fPhotElfromShower/fSize)", 1500, -3., 3.);
+    fHistADC2PhotEl->SetXTitle("log_{10}(fPhotElfromShower / fSize) [photel/ADC count]");
+
+
+    fHistPhot2PhotEl = new TH1F(AddSerialNumber("Phot2PhotEl"), "Photon conversion efficiency", 1000, 0., 1.);
+    fHistPhot2PhotEl->SetXTitle("Overall photon conversion efficiency [photoelectron/photon]");
+
 }
 
@@ -101,5 +106,7 @@
 Int_t MMcCalibrationCalc::PreProcess(MParList *pList)
 {
-    fHistRatio->Reset();
+    fHistADC2PhotEl->Reset();
+    fHistPhot2PhotEl->Reset();
+
     fADC2PhotEl = 0;
     fPhot2PhotEl = 0;
@@ -215,8 +222,7 @@
         return kTRUE;
 
-    fPhot2PhotEl += (Float_t) fMcEvt->GetPhotElfromShower() /
-      (Float_t) fMcEvt->GetPassPhotCone();
-
-    fHistRatio->Fill(TMath::Log10(fMcEvt->GetPhotElfromShower()/size));
+    fHistADC2PhotEl->Fill(TMath::Log10(fMcEvt->GetPhotElfromShower()/size));
+    fHistPhot2PhotEl->Fill( (Float_t) fMcEvt->GetPhotElfromShower() /
+			(Float_t) fMcEvt->GetPassPhotCone() );
 
     return kTRUE;
@@ -229,5 +235,5 @@
 Int_t MMcCalibrationCalc::PostProcess()
 {
-    const Stat_t n = fHistRatio->GetEntries();
+    const Stat_t n = fHistADC2PhotEl->GetEntries();
     if (n<1)
     {
@@ -236,5 +242,5 @@
     }
 
-    fPhot2PhotEl /= n;   // Average quantum efficiency
+    fPhot2PhotEl = fHistPhot2PhotEl->GetMean();   // Average quantum efficiency
 
     //
@@ -244,7 +250,7 @@
     Stat_t summax = 0;
     Int_t  mode   = 0;
-    for (Int_t ibin = 1+reach; ibin <= fHistRatio->GetNbinsX()-reach; ibin++)
-    {
-        const Stat_t sum = fHistRatio->Integral(ibin-reach, ibin+reach);
+    for (Int_t ibin = 1+reach; ibin <= fHistADC2PhotEl->GetNbinsX()-reach; ibin++)
+    {
+        const Stat_t sum = fHistADC2PhotEl->Integral(ibin-reach, ibin+reach);
 
         if (sum <= summax)
@@ -255,5 +261,5 @@
     }
 
-    fADC2PhotEl = TMath::Power(10, fHistRatio->GetBinCenter(mode));
+    fADC2PhotEl = TMath::Power(10, fHistADC2PhotEl->GetBinCenter(mode));
 
     const Int_t num = fCalCam->GetSize();
@@ -270,5 +276,5 @@
         // average QE for a spectrum like that of Cherenkov light (see the documentration 
 	// of MCalibrationQEPix). 
-	// Here we obtain average QE using already a Cherenkov spectrum so AvNormFFacto 
+	// Here we obtain average QE using already a Cherenkov spectrum so AvNormFFactor
 	// must be 1.
 
Index: trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.h	(revision 3851)
+++ trunk/MagicSoft/Mars/mcalib/MMcCalibrationCalc.h	(revision 3852)
@@ -31,5 +31,6 @@
     Long_t  fEvents;
 
-    TH1F*   fHistRatio; // Histogram for monitoring the calibration.
+    TH1F*   fHistADC2PhotEl;
+    TH1F*   fHistPhot2PhotEl; // Histograms for monitoring the calibration.
 
     Bool_t CheckRunType(MParList *pList) const;
@@ -42,5 +43,6 @@
     MMcCalibrationCalc(const char *name=NULL, const char *title=NULL);
 
-    TH1F*   GetHist() { return fHistRatio; }
+    TH1F*   GetHistADC2PhotEl() { return fHistADC2PhotEl; }
+    TH1F*   GetHistPhot2PhotEl() { return fHistPhot2PhotEl; }
 
     ClassDef(MMcCalibrationCalc, 0)   // Task which obtains, for MC files, the calibration factor from ADC counts to photons.