Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 6456)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 6457)
@@ -46,4 +46,20 @@
    * mraw/MRawFileRead.[h,cc]:
      - calculate total number of events from all files in PreProcess
+
+   * mcalib/MCalibConstCam.cc:
+     - added case 2 to GetPixelContent
+
+   * mjobs/MJCalibrateSignal.cc:
+     - fixed redirection of stream with interleaved calibration infos
+     - changed 'Arrival Time' to 'Calibrated Arrival Time'
+     - display interpolated signal in equivalent photoelectrons to
+       to get rid of scaling effects which makes it difficult to see 
+       details of the structure of the inner pixels in the histogram.
+       With this you can immediatly see whether the relative number
+       of phe in the outer pixels is equiv. to the inner pixels.
+     - the same for the calibration factor - with the same argument
+
+   * mhist/MHCamera.cc:
+     - changed drawing such, that NaN is not displayed anymore
 
 
Index: /trunk/MagicSoft/Mars/mcalib/MCalibConstCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibConstCam.cc	(revision 6456)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibConstCam.cc	(revision 6457)
@@ -260,4 +260,7 @@
       val = (*this)[idx].GetCalibFFactor();
       break;
+    case 2:
+      val = (*this)[idx].GetCalibConst()*cam.GetPixRatio(idx);
+      break;
     default:
       return kFALSE;
Index: /trunk/MagicSoft/Mars/mhist/MHCamera.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 6456)
+++ /trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 6457)
@@ -858,13 +858,14 @@
         if (!issame)
         {
-            if (IsUsed(i) && iscol)
+            const Bool_t isnan = TMath::IsNaN(fArray[i+1]);
+            if (!IsUsed(i) || !iscol || isnan)
             {
-                if (TMath::IsNaN(fArray[i+1]))
+                hex.SetFillColor(10);
+
+                if (isnan)
                     gLog << warn << "MHCamera::Update: " << GetName() << " <" << GetTitle() << "> - Pixel Index #" << i << " contents is NaN (Not a Number)..." << endl;
-
-                hex.SetFillColor(GetColor(GetBinContent(i+1), min, max, islog));
             }
             else
-                hex.SetFillColor(10);
+                hex.SetFillColor(GetColor(GetBinContent(i+1), min, max, islog));
         }
 
Index: /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 6456)
+++ /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 6457)
@@ -477,10 +477,11 @@
 
     MFTriggerPattern        fcalib("CalibFilter");
+    fcalib.RequireCalibration();
+
     MCalibrationChargeCalc  chcalc;
     MCalibrationRelTimeCalc recalc;
     MCalibCalcFromPast      pacalc;
-
-    fcalib.RequireCalibration();
-    //    fcalib.SetInverted();
+    chcalc.SetOutputFile("");
+    recalc.SetOutputFile("");
 
     pinext.SetPedestals(&pedcamab);
@@ -508,7 +509,7 @@
     filhil.SetBit(MFillH::kDoNotDisplay);
 
-    MCalibrateRelTimes     caltm;
-    MBadPixelsCalc         bpcal;
-    MBadPixelsTreat        treat;
+    MCalibrateRelTimes caltm;
+    MBadPixelsCalc     bpcal;
+    MBadPixelsTreat    treat;
 
     bpcal.SetNamePedPhotCam("MPedPhotFromExtractor");
@@ -519,14 +520,13 @@
         treat.SetProcessTimes(kFALSE);
 
-
-    MHCamEvent evt0(0, "PedFLG",      "Fundamental Pedestal from Lo Gain;;P [cnts/sl]");
-    MHCamEvent evt1(2, "PedRmsFLG",   "RMS from Extractor applied to ped.;;\\sigma_{p} [cnts/sl]");
-    MHCamEvent evt2(0, "Extra'd",     "Extracted Signal;;S [cnts/sl]");
-    //    MHCamEvent evt3(4, "PedPhot",     "Calibrated Pedestal;;P [phe]");
-    MHCamEvent evt4(5, "PedRMS",      "Calibrated RMS from Extractor applied to ped.;;\\sigma_{p} [phe]");
-    MHCamEvent evt5(3, "Interp'd",    "Interpolated Signal;;S [phe]");
-    MHCamEvent evt6(2, "Unsuitable",  "Fraction of unsuitable events per Pixel;;[1]");
-    MHCamEvent evt7(0, "Times",       "Arrival Time;;T [fadc sl]");
-    MHCamEvent evt8(0, "Conv",        "Calibration Conv. Factors;;[phe/fadc cnts]");
+    MHCamEvent evt0(0, "PedFLG",     "Fundamental Pedestal from Lo Gain;;P [cnts/sl]");
+    MHCamEvent evt1(2, "PedRmsFLG",  "RMS from Extractor applied to ped.;;\\sigma_{p} [cnts/sl]");
+    MHCamEvent evt2(0, "Extra'd",    "Extracted Signal;;S [cnts/sl]");
+    // MHCamEvent evt3(4, "PedPhot",    "Calibrated Pedestal;;P [phe]");
+    MHCamEvent evt4(5, "PedRMS",     "Calibrated RMS from Extractor applied to ped.;;\\sigma_{p} [phe]");
+    MHCamEvent evt5(0, "Interp'd",   "Interpolated Signal;;S [phe]");
+    MHCamEvent evt6(2, "Unsuitable", "Fraction of unsuitable events per Pixel;;[1]");
+    MHCamEvent evt7(0, "Times",      "Calibrated Arrival Time;;T [fadc sl]");
+    MHCamEvent evt8(2, "Conv",       "Calibration Conv. Factors;;[phe/fadc cnts]");
 
     evt0.EnableSqrtVariance();