Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 7071)
+++ trunk/MagicSoft/Mars/Changelog	(revision 7072)
@@ -72,4 +72,9 @@
      - replaced wrong MaxHiGainVar by MaxSignalVar (was nowehere 
        really used)
+
+   * mjobs/MJCalibrateSignal.cc, mjobs/MJCalibration.cc:
+     - some simplifications to the access of histograms after the loop
+       has finished. There is no need to search for them in the parameter
+       list.
 
 
Index: trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 7071)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 7072)
@@ -804,16 +804,8 @@
       {
         if (fIsPulsePosCheck)
-          {
-            MHCalibrationPulseTimeCam *pcam = (MHCalibrationPulseTimeCam*)plist.FindObject("MHCalibrationPulseTimeCam");
-            MHCalibrationPix &pix1 = (*pcam)[fCheckedPixId];
-            pix1.DrawClone("");
-          }
+            hpulcam[fCheckedPixId].DrawClone("");
         
 	if (fIsHiLoCalibration)
-	  {
-	    MHCalibrationHiLoCam *hcam = (MHCalibrationHiLoCam*)plist.FindObject("MHCalibrationHiLoCam");
-	    MHCalibrationPix &pix2 = (*hcam)[fCheckedPixId];
-	    pix2.DrawClone("");
-	  }
+	    hilocam[fCheckedPixId].DrawClone("");
       }
 
@@ -823,10 +815,10 @@
       interlacedcont.Add(&hilcam);
 
-    if (IsHistsStorage())
-      {
+    if (fIsPulsePosCheck)
+        interlacedcont.Add(plist.FindObject("MHCalibrationPulseTimeCam"));
+
+    if (fIsHiLoCalibration)
         interlacedcont.Add(plist.FindObject("MHCalibrationHiLoCam"));
-        interlacedcont.Add(plist.FindObject("MHCalibrationPulseTimeCam"));
-      }
-    
+
     if (!WriteResult(interlacedcont))
       return kFALSE;
@@ -842,55 +834,23 @@
 void MJCalibrateSignal::DisplayResult(MParList &plist)
 {
-
-    if (!fDisplay)
+    if (!fDisplay || !fIsHiLoCalibration)
         return;
 
-    MGeomCam &geomcam = *(MGeomCam*)plist.FindObject("MGeomCam");
-/*
-    //
-    // Get container from list
-    //
-    MCalibrationPulseTimeCam *pcam = (MCalibrationPulseTimeCam*)plist.FindObject("MCalibrationPulseTimeCam");
-
-    MHCamera disp11 (geomcam, "PulseTime", "Mean pulse arrival time cosmics");
-    MHCamera disp21 (geomcam, "PulseTimeRMS", "RMS of pulse arrival time cosmics");
-
-    if (pcam)
-      {
-        disp11.SetCamContent(*pcam,  0);
-        disp11.SetCamError(  *pcam,  1);
-        disp21.SetCamContent(*pcam,  2);
-        disp21.SetCamError(  *pcam,  3);
-      }
-    
-    disp11.SetYTitle("T [FADC sl.]");
-    disp21.SetYTitle("T [FADC sl.]");
-
-    if (fIsPulsePosCheck)
-      {
-        TCanvas &c0 = fDisplay->AddTab("PulseTime");
-        c0.Divide(2,3);
-        
-        disp11.CamDraw(c0, 1, 2, 1);
-        disp21.CamDraw(c0, 2, 2, 1);
-      }
- */
-    if (!fIsHiLoCalibration)
-      return;
-
-    MCalibrationHiLoCam *hcam      = (MCalibrationHiLoCam*)plist.FindObject("MCalibrationHiLoCam");
+    MCalibrationHiLoCam *hcam = (MCalibrationHiLoCam*)plist.FindObject("MCalibrationHiLoCam");
+    MGeomCam            *geom = (MGeomCam*)plist.FindObject("MGeomCam");
+    if (!hcam || !geom)
+        return;
 
     // Create histograms to display
-    MHCamera disp1 (geomcam, "HiLoConv", "Ratio Amplification HiGain vs. LoGain (Charges)");
-    MHCamera disp2 (geomcam, "HiLoDiff", "Arrival Time Diff. HiGain vs. LoGain (Times)");
-
-    disp1.SetCamContent(*hcam,  0);
-    disp1.SetCamError(  *hcam,  1);
-    disp2.SetCamContent(*hcam,  5);
-    disp2.SetCamError(  *hcam,  6);
+    MHCamera disp1(*geom, "HiLoConv", "Ratio Amplification HiGain vs. LoGain (Charges)");
+    MHCamera disp2(*geom, "HiLoDiff", "Arrival Time Diff. HiGain vs. LoGain (Times)");
+
+    disp1.SetCamContent(*hcam, 0);
+    disp1.SetCamError(  *hcam, 1);
+    disp2.SetCamContent(*hcam, 5);
+    disp2.SetCamError(  *hcam, 6);
 
     disp1.SetYTitle("R [1]");
     disp2.SetYTitle("\\Delta T [FADC sl.]");
-
 
     TCanvas &c1 = fDisplay->AddTab("HiLoConv");