Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 6031)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 6032)
@@ -20,4 +20,44 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/01/27 Thomas Bretz
+
+   * callisto.cc:
+     - don't display starting pedestals when calibrating the signal
+
+   * callisto.rc:
+     - added some comments
+
+   * star.rc:
+     - according to Daniel M. we have agreed to chenge the default
+       cleaning level to adapt it roughly to the new pedestal
+
+   * manalysis/MCerPhotPix.[h,cc], mpedestal/MPedPhotPix.h:
+     - as agreed in the current calibration meeting we truncate the
+       precision of the stored floating point values to roughly 0.5%
+       to gain storage space in the calibrated data (the gzip
+       algorithm compresses this stuff nicely - we gain roughly 15%)
+
+   * mhflux/MHFalseSource.cc, mjobs/MJCalibration.cc, mjobs/MJStar.cc:
+     - added a comment
+
+   * mjobs/MJCalibrateSignal.cc:
+     - changed title of unsuitable plot
+     - removed plot for calibrated fundamental pedestal as agreed in the
+       current calibration meeting (we may change this to an option)
+
+   * mjobs/MJPedestal.[h,cc]:
+     - changed the name of the "PedDiff" plot to be consistent with the
+       other tab-name
+     - changed the options for the display
+     - removed the dependancy of fDisplayType and the SetDataCheck
+       option
+     - added option kDisplayNone
+     - renamed enums from k*Display to kDisplay*
+
+   * mhist/MHCamEvent.cc:
+     - trying to get rid of the Err_%p workaround.
+
+
+
  2005/01/26 Abelardo Moralejo
 
@@ -40,4 +80,5 @@
      - added missing container MImagePar. Added possibility to set the
        source position on the camera (for the wobble mode).
+
 
 
Index: /trunk/MagicSoft/Mars/mhist/MHCamEvent.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhist/MHCamEvent.cc	(revision 6031)
+++ /trunk/MagicSoft/Mars/mhist/MHCamEvent.cc	(revision 6032)
@@ -236,7 +236,7 @@
 
     pad->cd(2);
-    if (gPad->FindObject(Form("Proj_%p", this)))
-    {
-        TH1 *h=fSum->Projection(Form("Proj_%p", this));
+    if (gPad->FindObject(Form("%s;proj", fName.Data())))
+    {
+        TH1 *h=fSum->Projection(Form("%s;proj", fName.Data()));
         if (h->GetMaximum()>0)
             gPad->SetLogy();
@@ -244,14 +244,14 @@
 
     pad->cd(5);
-    if (gPad->FindObject(Form("ProfR_%p", this)))
-        fSum->RadialProfile(Form("ProfR_%p", this));
+    if (gPad->FindObject(Form("%s;rad", fName.Data())))
+        fSum->RadialProfile(Form("%s;rad", fName.Data()));
 
     pad->cd(6);
-    if (gPad->FindObject(Form("ProfA_%p", this)))
-        fSum->AzimuthProfile(Form("ProfA_%p", this));
+    if (gPad->FindObject(Form("%s;az", fName.Data())))
+        fSum->AzimuthProfile(Form("%s;az", fName.Data()));
 
     pad->cd(4);
     gPad->cd(1);
-    MHCamera *cam = (MHCamera*)gPad->FindObject(Form("Err_%p", this));
+    MHCamera *cam = (MHCamera*)gPad->FindObject(Form("%s;err", fName.Data()));
     if (cam)
         cam->SetCamContent(*fSum, 1);
@@ -285,5 +285,5 @@
     gPad->SetBorderMode(0);
     gPad->SetPad(0.66, 0.5, 0.99, 0.99);
-    TH1 *h = fSum->Projection(Form("Proj_%p", this), 50);
+    TH1 *h = fSum->Projection(Form("%s;proj", fName.Data()), 50);
     h->SetTitle("Projection");
     h->SetBit(kCanDelete);
@@ -300,5 +300,5 @@
 
     MHCamera *cam = new MHCamera(*fSum->GetGeometry());
-    cam->SetName(Form("Err_%p", this));
+    cam->SetName(Form("%s;err", fName.Data()));
     cam->SetTitle(fSum->TestBit(MHCamera::kVariance)?"Variance":"Root Mean Squared (rms)");
     cam->SetYTitle(fSum->GetYaxis()->GetTitle());
@@ -308,5 +308,5 @@
 
     pad->cd(5);
-    h = (TH1*)fSum->RadialProfile(Form("ProfR_%p", this), 20);
+    h = (TH1*)fSum->RadialProfile(Form("%s;rad", fName.Data()), 20);
     h->SetTitle("Radial Profile");
     h->SetBit(kCanDelete|TH1::kNoStats);
@@ -314,5 +314,5 @@
 
     pad->cd(6);
-    h = (TH1*)fSum->AzimuthProfile(Form("ProfA_%p", this), 30);
+    h = (TH1*)fSum->AzimuthProfile(Form("%s;az", fName.Data()), 30);
     h->SetTitle("Azimuth Profile");
     h->SetBit(kCanDelete|TH1::kNoStats);