Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 2511)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 2512)
@@ -1,13 +1,32 @@
                                                  -*-*- END OF LINE -*-*-
+ 2003/11/13: Thomas Bretz
+
+   * macros/readCT1.C:
+     - fixed to work with the new MHCamera::Draw (see Mantis)
+     - changed to display event and cleaned event
+     
+   * macros/readMagic.C:
+     - fixed to work with the new MHCamera::Draw (see Mantis)
+
+   * mhist/MHEvent.cc:
+     - fixed display of the energy (see Mantis)
+     
+   * mmain/MEventDisplay.cc:
+     - fixed usage of small canvas with new MHCamera::Draw
+
+
+
  2003/11/11: Rudy Bock
   
-   * mfilter/MFGeomag.cc and ...h:
+   * mfilter/MFGeomag.[h,cc]:
      - added a new class which reads two ASCII files (for +ve and -ve
-     particles) from the mfilter directory, and filters out 
-     low-energy charged Monte Carlo particles which do not reach the
-     earth's surface. Tables are from Adrian Biland. A method is included which 
-     allows treating gammas as electrons (i.e. rejects low energy particles).
-
- 
+       particles) from the mfilter directory, and filters out 
+       low-energy charged Monte Carlo particles which do not reach the
+       earth's surface. Tables are from Adrian Biland. A method is
+       included which allows treating gammas as electrons (i.e. rejects
+       low energy particles).
+
+
+
  2003/11/11: Nicola Galante
 
@@ -15,5 +34,6 @@
      - Removed 'const' qualifier for the returned object of the
        method (TH1 *)MHMcTriggerLvl2::GetHistByName(const TString name)
- 
+
+
 
  2003/11/10: Nicola Galante
Index: /trunk/MagicSoft/Mars/macros/readCT1.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/readCT1.C	(revision 2511)
+++ /trunk/MagicSoft/Mars/macros/readCT1.C	(revision 2512)
@@ -82,6 +82,18 @@
 
     Int_t icount = 0;
-    MHCamera display(geomcam);
-    display.Draw();
+    MHCamera display1(*geomcam);
+    MHCamera display2(*geomcam);
+
+    TCanvas c("Events", "Real Events", 300, 600);
+    c.SetBorderMode(0);
+    c.Divide(1,2);
+    c.cd(1);
+    display1.Draw();
+    gPad->cd(1);
+    hillas.Draw();
+    c.cd(2);
+    display2.Draw();
+    gPad->cd(1);
+    hillas.Draw();
 
     while ((rc=tlist.Process()))
@@ -93,17 +105,15 @@
             continue;
 
-        display.SetCamContent(*evt);
-        display.Update();
+        display1.SetCamContent(*(MCerPhotEvt*)clone.GetClone());
+        display2.SetCamContent(*(MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
 
-        if (!HandleInput())
-            break;
+        c->GetPad(1)->GetPad(1)->Modified();
+        c->GetPad(1)->GetPad(1)->Update();
+        c->GetPad(2)->GetPad(1)->Modified();
+        c->GetPad(2)->GetPad(1)->Update();
 
-        hillas.Draw();
         hillas.Print();
         hillasext.Print();
         newimgpar.Print();
-
-        display.SetCamContent(*(MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
-        display.Update();
 
         if (!HandleInput())
Index: /trunk/MagicSoft/Mars/macros/readMagic.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/readMagic.C	(revision 2511)
+++ /trunk/MagicSoft/Mars/macros/readMagic.C	(revision 2512)
@@ -46,5 +46,5 @@
 }
 
-void readMagic(const char *fname="~/Proton_zbin0_0_7_11650to11659_w0.root")
+void readMagic(const char *fname="../Proton*.root")
 {
     MParList plist;
@@ -105,15 +105,11 @@
     c.Divide(1,2);
     c.cd(1);
-    gPad->SetBorderMode(0);
-    gPad->Divide(1,1);
+    display1.Draw();
     gPad->cd(1);
-    gPad->SetBorderMode(0);
-    display1.Draw();
+    hillas.Draw();
     c.cd(2);
-    gPad->SetBorderMode(0);
-    gPad->Divide(1,1);
+    display2.Draw();
     gPad->cd(1);
-    gPad->SetBorderMode(0);
-    display2.Draw();
+    hillas.Draw();
 
     // Use this if you don't want the event to be autoscaled
@@ -128,13 +124,8 @@
         display2.SetCamContent(*(MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
 
-        c->cd(1);
-        gPad->cd(1);
-        gPad->Modified();
-        gPad->Update();
-        c->cd(2);
-        gPad->cd(1);
-        hillas.Draw();
-        gPad->Modified();
-        gPad->Update();
+        c->GetPad(1)->GetPad(1)->Modified();
+        c->GetPad(1)->GetPad(1)->Update();
+        c->GetPad(2)->GetPad(1)->Modified();
+        c->GetPad(2)->GetPad(1)->Update();
 
         hillas.Print();
Index: /trunk/MagicSoft/Mars/mhist/MHEvent.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhist/MHEvent.cc	(revision 2511)
+++ /trunk/MagicSoft/Mars/mhist/MHEvent.cc	(revision 2512)
@@ -229,7 +229,7 @@
         s += "  E=";
         if (fMcEvt->GetEnergy()>1000)
-            txt += Form("%.1fTeV", fMcEvt->GetEnergy()/1000);
+            s += Form("%.1fTeV", fMcEvt->GetEnergy()/1000);
         else
-            txt += Form("%dGeV", fMcEvt->GetEnergy()+.5);
+            s += Form("%dGeV", fMcEvt->GetEnergy()+.5);
         s += " r=";
         s += (int)(fMcEvt->GetImpact()/100+.5);
Index: /trunk/MagicSoft/Mars/mmain/MEventDisplay.cc
===================================================================
--- /trunk/MagicSoft/Mars/mmain/MEventDisplay.cc	(revision 2511)
+++ /trunk/MagicSoft/Mars/mmain/MEventDisplay.cc	(revision 2512)
@@ -454,5 +454,5 @@
     ReadinEvent();
 
-    TGString *txt = new TGString(Form("of %d.", GetReader()->GetEntries()));
+    TGString *txt = new TGString(Form("of %d", GetReader()->GetEntries()));
     fNumOfEvts->SetText(txt);
 
@@ -463,5 +463,5 @@
     MHEvent *o = (MHEvent*)plist->FindObject("Signal");
     fCanvas->SetName(Form("%p;%p;PixelContent", o->GetHist(),
-                          GetCanvas(1)->GetPad(1)->GetPad(1)));
+                          GetCanvas(1)->GetPad(1)));
 
     //