Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 4247)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 4248)
@@ -18,4 +18,10 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/06/01: Markus Gaug
+ 
+   * mjobs/MJCalibration.cc
+     - small change in the way the "full display" is displayed
+
 
  2004/05/31: Hendrik Bartko
Index: /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 4247)
+++ /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 4248)
@@ -543,23 +543,6 @@
         gPad->GetCanvas()->SaveAs(Form("%s%s%s",blind->GetName(),(fRuns->GetRunsAsString()).Data(),".root"));
         
-        MHCalibrationChargeCam *ccm = (MHCalibrationChargeCam*)plist.FindObject("MHCalibrationChargeCam");
-        ccm->DrawClone();
-        gPad->GetCanvas()->SaveAs(Form("%s%s%s",ccm->GetName(),(fRuns->GetRunsAsString()).Data(),".root"));
-        
-        if (fRelTimes)
-          {
-            MHCalibrationRelTimeCam *rel = (MHCalibrationRelTimeCam*)plist.FindObject("MHCalibrationRelTimeCam");
-            rel->DrawClone();
-            gPad->GetCanvas()->SaveAs(Form("%s%s%s",rel->GetName(),(fRuns->GetRunsAsString()).Data(),".root"));
-          }
-        
         MHCalibrationCam *cam = (MHCalibrationCam*)plist.FindObject("MHCalibrationChargeCam");
 
-        for (Int_t aidx=0;aidx<cam->GetAverageAreas();aidx++)
-          {
-            cam->GetAverageHiGainArea(aidx).DrawClone("all");
-            cam->GetAverageLoGainArea(aidx).DrawClone("all");
-          }
-        
         for (Int_t sector=1;sector<cam->GetAverageSectors();sector++)
           {
@@ -1039,4 +1022,10 @@
   fillcam.SetNameTab("Charge");
   filltme.SetNameTab("RelTimes");
+
+  if (fDisplayType == kFullDisplay)
+    {
+      fillcam.SetDrawOption("all");
+      filltme.SetDrawOption("all");
+    }
   
   
@@ -1113,4 +1102,5 @@
   DisplayResult(plist);
 
+  
   if (!WriteResult())
     return kFALSE;